improve logging
add client batching