Updated JavaDoc notation. 
Fixed some omissions and errors.