More fixing, maps, production check