Keywords can now have hyphens and underscores
Spelling fixes to make tests run