A bunch of edits - getting close to release 2.1