Javadocs and slightly cleaned up