fixes for Classic Sixth Edition
use hashes instead of case statements
eighth edition exceptions