changed strings and added croutons
removed todos
javadoc and formatting