removed TODOs, mapping seems correct
(re)adding TODOs regarding language
some more test cases