fix findbugs problems

now passes moderate findbugs checking with 0 errors.
that one was awesome. Hint: && binds tighter than || ...