Eq -> PartialEq
Fixed some warnings