Make some macros functions
Big re-organisation of monster files
Unbreak kin summoning