bugfixes, mainly due to trying out PMD and findbugs
Merge pull request #50 from stuart-warren/pmd

bugfixes, mainly due to trying out PMD and findbugs