some output handling, and fight break fixes