continued addCharEquips promise logic, fixed some bugs