Various updates and cleanups