Release 2.1

Some minor, pedantic revisions for things that somehow irked me.