removed some TODO strings (sometimes removed the file if there were only TODOs). Added some complex-constraints for those TODOs