Added comments and fixed some minor things regarding equipments