State::makeEntity now sets Entity's state pointer (this was the source of the very public segfault)