some 'grammar' changes