# handled some TODOs especially thus related to logging