another round of fixups