Combat summary

added combat summary - other minor bug fixes