- Added missing explicit Overrides.
- General cleanup
- Clean up some javadoc.
- Change a for loop into a foreach loop.