minor changes & javadocs