See comments

Changed so we add classes to class list even if they are key words
Corrected previous error that classes with same name as a built in
class don’t get reported to the error handler