Small syntax corrections, Javadoc.
Merge pull request #669 from fineswap/SmallFixes

Small syntax corrections, Javadoc.