Make start on fixing the fixer

Done a large part of fix roms, but I am shattered. Last push tomorrow.