Added equals and comments