fixed dialogue and combat bugs