try some fixes with syntax for keywords.