EntityList tidy + a bunch of client pointer changes