few changes

mostly to war class