small changes and a few javadocs