Bugfix
more logging changes