heavy bug fixing - still lots of logging annotations