cleanings and javadoc added