A minor feature or two, and some minor bug fixes.