Update inline TODOs and some javadocs