more javadoc and method impls
fixed javadoc