Mucking about with SlotType, mostly. otherwise minor changes.