some fixups now that i'm using it.