Fixing many many things