FINAL: Added java doc
Edited mistakes
Edited javadoc