Various changes

Can you change the `ErrorType` variable to be better named (it's capitalized funny too)?