Add more equatables, document publics