Fixed more warnings added missing hashCode() methods
Fixed warnings, added missing @Override annotations