fix table schema. fix batching.