Lots of small changes and general cleaning up of the code.
My glassfish server broke and I can't do much more till I fix it.