various fixes (prep to rerun of hi2a)