ugh
wip
more logging improvements
wip