fixup everything