Updating: miscellaneous updates and cleanups.