removed, fixed some stuff and added some javadoc