more bugfixes.  Still completely impossible for me to run local tests