rework logging crap