updates and cleanups