Phase 1 of making buildable with JDK5.
Adding @Override whre necessary
Minor tweaks