Small styling cleanups. Adding better error checking for fight-adding