fixed some more sonar issues.
fixed hashCode implementations
Merge pull request #157 from flexiblepower/development_thijl

fixed some more sonar issues.