Improve batch size / logging