Various updates and cleanups.