removed some TODOs that were solved and removed my author tags.