Added missing keywords & properties, and single-quoted strings