All TODOs for commenting and Java 7 enforcement accomplished