Updates and cleanups.