improve methode-names, add some javadoc