continued addCharEquips logic, fixed some promise bugs