Deriving Clone, Eq + minor fixes