fixes to equals()