JavaDoc, Todos, and minor improvements