Adds javadocs & a couple missing features