A few more methods, a lot more javadoc