removed extraneous stuff, fixed scm
fixed missing javadoc