Added more logging across the board
Improved logger interface