Work on logging, some other updates for production