Added more logging
A little make-up