Cleaned examples and changed grammar to accept classnames in a few additional places