Fix some keywords that were not recognized
Fix some keywords with spaces not being recognized