A few fixes (for updateCastleFlags()) + add Madhouse and Pocketknight variants