Fixed scaling bug and worked on Map