keyword checks are now added in places where they need to be.