Javadoccing and small changes
Javadoccing and small changes