Add some logging messages
Fix some formatting