Some javadoc, removed hashcode methods and some other thingies
Merge origin/master