Some javadoc + added TODOs