Several miscellaneous updates.  :)