Small changes; Address equals(Object) and hashCode()