removed old combat report and added new (plus a little cleanup)