fix: a large suite of miscellaneous fixes