assorted updates and improvements