Deleted a lot of TODOs, added some JDocs