Changed some javadoc back

Changed some javadoc back
Commit 499

Commit 499
Commit 500

Commit 500