minor combat changes