Update to use equipment rather than equipments, and some other stuff