fix various findbugs errors categorized CORRECTNESS and BAD_PRACTICE

**please review**
What? There's another Tuple? This time having a parameter. Could you look and see why we have two?