improve logging and fix up docker