add equipement list and fix some bug.