added some javadoc stuff, kind of a work in progress