Made the WorldReader more tidy, and support for info about non-entities