Upgraded to Maven Annotations

Use java 5 annotations for maven plugin plugin usage.
Added some missing curly brackets.
Replaced todo's with javadocs
Added a couple of missing javadocs