fixed bugs with wrong name of logger variable, removed done TODOs