Polishing

This change polishes up the logging and push environment