Added equals and fixes