cont reworking the javadaocs and comments...