#39 Correction of TODOs