fixup everything!