Getting code to build with JDK5 with no warnings.
Replacing StringBuffers with StringBuilders where applicable
Adding @Override whre necessary
Minor tweaks