no clobber; bug fixes