Some touchups and cleanups