added types for some keywords
cleanup some error messages