diff --git a/components/story/create/storyForm.vue b/components/story/create/storyForm.vue
index ce36ef8..b80c0db 100644
--- a/components/story/create/storyForm.vue
+++ b/components/story/create/storyForm.vue
@@ -5,7 +5,7 @@
 	import { Field, FieldArray, useForm, useFieldArray } from "vee-validate";
 	import { ASpin } from "#components";
 	import { storySchema } from "@client/storyFormSchema";
-	import { FormStory, defaultChapter } from "@client/types/form/story";
+	import { FormStory, defaultChapter, FormChapter } from "@client/types/form/story";
 	import { autoEdit, autoSave, debouncedAutoEdit, debouncedAutoSave } from "@client/utils";
 
 	import findUser from "~/components/findUser.vue";
@@ -20,17 +20,16 @@
 		endpoint: string;
 		endpointMethod: "put" | "post";
 		submitText?: string;
+		draftData?: {
+			endpoint: string;
+			endpointMethod: "put" | "post";
+		};
 	}>();
-	let w;
-	onMounted(() => {
-		w = window;
-	});
 	const dc = defaultChapter;
-	//		data: FormStory;
 	const sdata = defineModel<FormStory>("data", {
 		required: true,
 	});
-	let drag = false;
+	let drag: boolean = false;
 	const expandos = ref<string[]>([]);
 
 	function logSubmit(values, actions) {
@@ -46,27 +45,32 @@
 				otherBtnInvoked.value = false;
 				await autoSave(values);
 			} else {
-				const { data: dat } = await useApiFetch(`/story/new`, {
+				const { data: dat } = await useApiFetch<any>(`/story/new`, {
 					method: "post",
 					body: values,
 				});
-				if (dat.success) {
-					await router.push(`/story/${dat.story._id}/1`);
+				if (dat.value.success) {
+					await router.push(`/story/${dat.value.story._id}/1`);
 				}
 			}
 		} else {
 			await autoEdit(values, props.endpoint, props.endpointMethod);
 		}
 	}
-	function inval({ values, errors, results }) {
-		logSubmit(values, undefined);
-	}
+
 	const { values, setFieldValue, handleSubmit } = useForm<FormStory>({
 		keepValuesOnUnmount: true,
 		validationSchema: storySchema,
 		initialValues: sdata.value,
 	});
-	// const { push, remove, move, fields } = useFieldArray<FormChapter>("chapters");
+	function renumber(update: (idx: number, value: FormChapter) => void) {
+		for (let i = 0; i < values.chapters.length; i++) {
+			const nv = values.chapters[i];
+			nv.index = i + 1;
+			update(i, nv);
+			sdata.value.chapters[i].index = i + 1;
+		}
+	}
 	const subCb = handleSubmit(onSubmit);
 
 	const pushHOF = (push) => (e) => {
@@ -96,7 +100,18 @@
 	};
 </script>
 <template>
-	<form data-testid="storyform" @submit="subCb" @change="() => (canDraft ? debouncedAutoSave(values) : debouncedAutoEdit(values, endpoint, endpointMethod))">
+	<form
+		data-testid="storyform"
+		@submit="subCb"
+		@change="
+			() =>
+				canDraft
+					? draftData
+						? debouncedAutoSave(values, draftData.endpoint, draftData.endpointMethod)
+						: debouncedAutoSave(values)
+					: debouncedAutoEdit(values, endpoint, endpointMethod)
+		"
+	>
 		<!-- <a-form v-bind:model="acData"> -->
 
 		<Field name="title" v-slot="{ value, field, errorMessage }">
@@ -112,30 +127,26 @@
 		</Field>
 		<a-divider />
 		<!-- <test1/> -->
-		<field-array name="chapters" v-slot="{ fields, push, remove, move }">
+		<field-array name="chapters" v-slot="{ fields, push, remove, move, update }">
 			<client-only :fallback="h(ASpin)">
 				<div>
-					<div v-for="(element, index) in data.chapters">
+					<div v-for="(element, index) in values.chapters">
 						<client-only>
 							<Teleport :to="`#chapter-\\[${element.uuidKey}\\]`">
 								<a-collapse v-model:active-key="expandos" collapsible="icon">
 									<template #expandIcon="{ isActive }">
 										<span :data-testid="`storyform.chapters[${index}].collapse`"> <RightOutlined :rotate="isActive ? 90 : undefined" /></span>
 									</template>
-									<a-collapse-panel :key="`${element.uuidKey}`">
+									<a-collapse-panel :key="`${element.uuidKey}`" :data-testid="`storyform.chapters[${index}].outer`">
 										<template #header>
-											<div :data-testid="`storyform.chapters[${index}].header`" style="display: flex; justify-content: space-between">
+											<div :data-testid="`storyform.chapters[${index}].header`" style="display: flex; align-items: center; justify-content: space-between">
 												<span :data-testid="`storyform.chapters[${index}].titleEl`">{{ values.chapters[index]?.chapterTitle || "Untitled" }}</span>
 												<a-button
 													@click="
 														(e) => {
-															// let localFields = toRaw(fields);
-															// log.debug(`${index} | ${element.index}`);
-															// log.debug('fields->', localFields);
 															data.chapters.splice(index, 1);
 															remove(index);
-															// todo renumber
-															// renumber()
+															renumber(update);
 														}
 													"
 												>
@@ -172,6 +183,7 @@
 								console.debug(e.moved);
 								move(e.moved.oldIndex, e.moved.newIndex);
 								data.chapters = lmove(data.chapters, e.moved.oldIndex, e.moved.newIndex);
+								renumber(update);
 								// w.tinymce.remove();
 								// log.debug(toRaw(acData.chapters.map((a) => toRaw(a))));
 							}
@@ -191,3 +203,11 @@
 		<a-button html-type="submit" v-if="canDraft" @click="() => (otherBtnInvoked = true)"> Save for Later </a-button>
 	</form>
 </template>
+<style>
+	.ant-collapse-item > .ant-collapse-header {
+		align-items: center !important;
+	}
+	.ant-collapse-header.ant-collapse-icon-collapsible-only {
+		align-items: center !important;
+	}
+</style>