cleaned everything up
fixed everytying
made javadoc