Improved methods in MapModel and updated links in DrawMap