added fight display, streamlined fight function