Several keywords fixes and enhancements.

Get in sync up to 1st September.