updates

javadocs for stuff, new code!