improved javadoc, made fields private