Added support for a few missing keywords

Also enabled case ignore where appropriate.