fixup everythings!