Major correction of items & character classes