Comments

Uppdated with javadoc