Minor important changes

EqualsTo and CompareTo, equalsTo was part autogenerated so it might be buggy but I doubt it