minor update and cleanups