Updates for demo
clean up and larger batching