Rename M.equals, improved geometry functions