Some more touches, added necessary javadoc stuff