grammar issues and opinionated changes