Small style improvements
More interesting validation
More keywords
More validation rules, more keywords