Javadocs and other minor tweaks

Various tweaks... mostly javadocs