Fixed JavaDoc .... still containing bugs