resolved all findbug bugs apart from the ones André is going to have a look at