Findbugs

Hi Klacke, findbugs update.  Note I've not incorporate quite a few of the suggestions as there arent unit tests providing coverage.  

We'll add additional unit tests later and then refactor the remaining findbugs suggestions. 

Damian.