fixed Fantasy World and outputting to JSON

Plus a couple of minor rationalisations to some other files