Removed unnecessary semicolon
Fixed some JavaDoc "errors".
Mostly added missing descriptions to @returns and @params.
Merge branch 'cleanups' into development