More keywords, more syntax
minor adjustments

Minor adjustments