Oh I also removed a couple of unit classes from terrain package, it was confusing things
Merge branch 'clif7786' of https://github.com/cjeffery/sworsorc into clif7786