working on the merchant system and tweaking battles