diff --git a/apps/website/auto-api.ts b/apps/website/auto-api.ts
index d4f2bafe2..0d9442c8d 100644
--- a/apps/website/auto-api.ts
+++ b/apps/website/auto-api.ts
@@ -1,6 +1,5 @@
 import * as fs from 'fs';
 import { resolve } from 'path';
-import { inspect } from 'util';
 import { ViteDevServer } from 'vite';
 export default function autoAPI() {
   return {
diff --git a/apps/website/src/components/api-table/auto-api.tsx b/apps/website/src/components/api-table/auto-api.tsx
index 526b6b33c..b216be717 100644
--- a/apps/website/src/components/api-table/auto-api.tsx
+++ b/apps/website/src/components/api-table/auto-api.tsx
@@ -1,6 +1,5 @@
 import { JSXOutput, component$, $, QRL, useTask$, useSignal } from '@builder.io/qwik';
 import { APITable, type APITableProps } from './api-table';
-import { packages } from '../install-snippet/install-snippet';
 
 //This is a workaround for not being able to export across packages due to nx rule:
 // https://nx.dev/features/enforce-module-boundaries#enforce-module-boundaries
@@ -32,7 +31,7 @@ type ParsedCommentsProps = {
   parsedProps: PublicType;
   config: AutoAPIConfig;
 };
-const currentHeader = $((_: string) => {
+const currentHeader = $(() => {
   //cannot send h2 from here because current TOC can only read md
   return null;
 });
@@ -75,8 +74,8 @@ export const AutoAPI = component$<AnatomyTableProps>(
     return (
       <>
         {topHeaderSig.value}
-        {subComponents.map((e) => (
-          <SubComponent subComponent={e} config={config} />
+        {subComponents.map((e, index) => (
+          <SubComponent key={index} subComponent={e} config={config} />
         ))}
       </>
     );
@@ -109,10 +108,15 @@ const ParsedComments = component$<ParsedCommentsProps>(({ parsedProps, config })
   useTask$(async () => {
     const translation: APITableProps = {
       propDescriptors: parsedProps[key].map((e) => {
+        const isObject = e.type.includes('{');
+        const isUnion = e.type.includes('|');
+        const isPopup = isObject || isUnion;
+
         return {
           name: e.prop,
-          type: e.type,
+          type: isObject ? 'object' : isUnion ? 'union' : e.type,
           description: e.comment,
+          info: (isPopup && e.type) || undefined,
         };
       }),
     };
diff --git a/apps/website/src/routes/docs/headless/carousel/auto-api/api.ts b/apps/website/src/routes/docs/headless/carousel/auto-api/api.ts
new file mode 100644
index 000000000..473dbd7e0
--- /dev/null
+++ b/apps/website/src/routes/docs/headless/carousel/auto-api/api.ts
@@ -0,0 +1,122 @@
+export const api = {
+  carousel: [
+    {
+      bullet: [],
+    },
+    {
+      inline: [],
+    },
+    {
+      next: [],
+    },
+    {
+      pagination: [],
+    },
+    {
+      player: [],
+    },
+    {
+      previous: [],
+    },
+    {
+      root: [
+        {
+          CarouselRootProps: [
+            {
+              comment: 'The gap between slides',
+              prop: 'gap?',
+              type: 'number',
+            },
+            {
+              comment: 'Number of slides to show at once',
+              prop: 'slidesPerView?',
+              type: 'number',
+            },
+            {
+              comment: 'Whether the carousel is draggable',
+              prop: 'draggable?',
+              type: 'boolean',
+            },
+            {
+              comment: 'Alignment of slides within the viewport',
+              prop: 'align?',
+              type: "'start' | 'center' | 'end'",
+            },
+            {
+              comment: 'Whether the carousel should rewind',
+              prop: 'rewind?',
+              type: 'boolean',
+            },
+            {
+              comment: 'Bind the selected index to a signal',
+              prop: "'bind:selectedIndex'?",
+              type: 'Signal<number>',
+            },
+            {
+              comment: 'change the initial index of the carousel on render',
+              prop: 'startIndex?',
+              type: 'number',
+            },
+            {
+              comment:
+                '@deprecated Use bind:selectedIndex instead\n   Bind the current slide index to a signal',
+              prop: "'bind:currSlideIndex'?",
+              type: 'Signal<number>',
+            },
+            {
+              comment: 'Whether the carousel should autoplay',
+              prop: "'bind:autoplay'?",
+              type: 'Signal<boolean>',
+            },
+            {
+              comment: 'the current progress of the carousel',
+              prop: "'bind:progress'?",
+              type: 'Signal<number>',
+            },
+            {
+              comment: 'Time in milliseconds before the next slide plays during autoplay',
+              prop: 'autoPlayIntervalMs?',
+              type: 'number',
+            },
+            {
+              comment: '@internal Total number of slides',
+              prop: '_numSlides?',
+              type: 'number',
+            },
+            {
+              comment: '@internal Whether this carousel has a title',
+              prop: '_isTitle?',
+              type: 'boolean',
+            },
+            {
+              comment: 'The sensitivity of the carousel dragging',
+              prop: 'sensitivity?',
+              type: '{',
+            },
+          ],
+        },
+      ],
+    },
+    {
+      scroller: [],
+    },
+    {
+      slide: [],
+    },
+    {
+      step: [],
+    },
+    {
+      stepper: [],
+    },
+    {
+      title: [],
+    },
+    {
+      'use-carousel': [],
+    },
+    {
+      'use-scroller': [],
+    },
+  ],
+};
diff --git a/apps/website/src/routes/docs/headless/carousel/index.mdx b/apps/website/src/routes/docs/headless/carousel/index.mdx
index a0e32da50..a0449ce6f 100644
--- a/apps/website/src/routes/docs/headless/carousel/index.mdx
+++ b/apps/website/src/routes/docs/headless/carousel/index.mdx
@@ -4,6 +4,10 @@ import { FeatureList } from '~/components/feature-list/feature-list';
 
 import { Note } from '~/components/note/note';
 
+import { AutoAPI } from '~/components/api-table/auto-api';
+
+import { api } from './auto-api/api';
+
 <StatusBanner status={statusByComponent.headless.Carousel} />
 
 # Carousel
@@ -327,67 +331,4 @@ In the above example, we also use the headless progress component to show the pr
 
 ## API
 
-### Carousel.Root
-
-<APITable
-  propDescriptors={[
-    {
-      name: 'gap',
-      type: 'number',
-      description: 'The gap between slides.',
-    },
-    {
-      name: 'slidesPerView',
-      type: 'number',
-      description: 'Number of slides to show at once.',
-    },
-    {
-      name: 'draggable',
-      type: 'boolean',
-      description: 'Whether the carousel is draggable.',
-    },
-    {
-      name: 'align',
-      type: 'union',
-      description: 'Alignment of slides within the viewport.',
-      info: '"start" | "center" | "end"',
-    },
-    {
-      name: 'rewind',
-      type: 'boolean',
-      description: 'Whether the carousel should rewind.',
-    },
-    {
-      name: 'bind:selectedIndex',
-      type: 'Signal<number>',
-      description: 'Bind the selected index to a signal.',
-    },
-    {
-      name: 'startIndex',
-      type: 'number',
-      description: 'Change the initial index of the carousel on render.',
-    },
-    {
-      name: 'bind:autoplay',
-      type: 'Signal<boolean>',
-      description: 'Whether the carousel should autoplay.',
-    },
-    {
-      name: 'autoPlayIntervalMs',
-      type: 'number',
-      description: 'Time in milliseconds before the next slide plays during autoplay.',
-    },
-    {
-      name: 'direction',
-      type: 'union',
-      description:
-        'Change the direction of the carousel, for it to be veritical define the maxSlideHeight prop as well.',
-      info: '"row" | "column"',
-    },
-    {
-      name: 'maxSlideHeight',
-      type: 'number',
-      description: 'Write the height of the longest slide.',
-    },
-  ]}
-/>
+<AutoAPI api={api} />
diff --git a/apps/website/src/routes/docs/headless/select/index.mdx b/apps/website/src/routes/docs/headless/select/index.mdx
index d92d0c4bc..d42ead181 100644
--- a/apps/website/src/routes/docs/headless/select/index.mdx
+++ b/apps/website/src/routes/docs/headless/select/index.mdx
@@ -2,7 +2,6 @@
 title: Qwik UI | Select
 ---
 
-import { api } from './auto-api/api';
 import { FeatureList } from '~/components/feature-list/feature-list';
 import { statusByComponent } from '~/_state/component-statuses';
 
diff --git a/packages/kit-headless/src/components/carousel/inline.tsx b/packages/kit-headless/src/components/carousel/inline.tsx
index 80a804380..8c2d3bdcf 100644
--- a/packages/kit-headless/src/components/carousel/inline.tsx
+++ b/packages/kit-headless/src/components/carousel/inline.tsx
@@ -1,5 +1,5 @@
 import { Component } from '@builder.io/qwik';
-import { CarouselBase, CarouselRootProps } from './root';
+import { CarouselBase, PublicCarouselRootProps } from './root';
 import { Carousel } from '@qwik-ui/headless';
 import { findComponent, processChildren } from '../../utils/inline-component';
 
@@ -20,8 +20,8 @@ type InternalProps = {
   titleComponent?: typeof Carousel.Title;
 };
 
-export const CarouselRoot: Component<CarouselRootProps & InternalProps> = (
-  props: CarouselRootProps & InternalProps,
+export const CarouselRoot: Component<PublicCarouselRootProps & InternalProps> = (
+  props: PublicCarouselRootProps & InternalProps,
 ) => {
   const {
     children,
diff --git a/packages/kit-headless/src/components/carousel/root.tsx b/packages/kit-headless/src/components/carousel/root.tsx
index 720060dea..7a9209330 100644
--- a/packages/kit-headless/src/components/carousel/root.tsx
+++ b/packages/kit-headless/src/components/carousel/root.tsx
@@ -13,7 +13,7 @@ import { CarouselContext, carouselContextId } from './context';
 import { useBoundSignal } from '../../utils/bound-signal';
 import { useAutoplay } from './use-carousel';
 
-export type CarouselRootProps = PropsOf<'div'> & {
+export type PublicCarouselRootProps = PropsOf<'div'> & {
   /** The gap between slides */
   gap?: number;
 
@@ -72,7 +72,7 @@ export type CarouselRootProps = PropsOf<'div'> & {
   maxSlideHeight?: number;
 };
 
-export const CarouselBase = component$((props: CarouselRootProps) => {
+export const CarouselBase = component$((props: PublicCarouselRootProps) => {
   const {
     align,
     'bind:currSlideIndex': givenOldSlideIndexSig,
diff --git a/packages/kit-headless/src/components/toggle-group/index.tsx b/packages/kit-headless/src/components/toggle-group/index.tsx
index fc5b18aa7..0f2ad5e4c 100644
--- a/packages/kit-headless/src/components/toggle-group/index.tsx
+++ b/packages/kit-headless/src/components/toggle-group/index.tsx
@@ -1,6 +1,2 @@
-import { HToggleGroupItem } from './toggle-group-item';
-import { HToggleGroupRoot } from './toggle-group-root';
-export const ToggleGroup = {
-  Root: HToggleGroupRoot,
-  Item: HToggleGroupItem,
-};
+export { HToggleGroupItem as Item } from './toggle-group-item';
+export { HToggleGroupRoot as Root } from './toggle-group-root';
diff --git a/packages/kit-headless/src/index.ts b/packages/kit-headless/src/index.ts
index 77c2e051a..86198fa29 100644
--- a/packages/kit-headless/src/index.ts
+++ b/packages/kit-headless/src/index.ts
@@ -13,7 +13,7 @@ export * as Progress from './components/progress';
 export * from './components/separator';
 export * as Tabs from './components/tabs';
 export { Toggle } from './components/toggle';
-export { ToggleGroup } from './components/toggle-group';
+export * as ToggleGroup from './components/toggle-group';
 export * from './utils/visually-hidden';
 export * as Tooltip from './components/tooltip';
 export * as Dropdown from './components/dropdown';