some attempted fixups