bootstrap update and cleanups