Fixing up some combat things and adding some rewards/penalties to combat