Javadoc cleaning out, some unused imports removed, and minor fixes
Merge pull request #361 from jtorrente/minor-issues

Javadoc cleaning out, some unused imports removed, and minor fixes