Fix issues with create, further progress on batching