More attempts to fix class/race loading from config, and tweaks.