fixing map stuff