Findbugs corrected. 3 equals/hashmethods needed