bugfixing and comment
adjust TODOs for better grep