a few fixes to the fantasy section, a few others. Sorry, I can't remember, big commit.