Removed some TODOs, added some TODOs, bugfixes