Added equals() and hashCode() to a few vital classes