Map is now bidimensional. Fixed minor bugs