Map creation done, no more infinite loop

Bug hunt in progress, however we expect this to be in good shape already