syntax detection improvements, added new keywords.