Minor updates and cleanups