tidy up page layout, handle attacking friendlies better, reword atrium and reincarnation. (this breaks a couple of tests)