Tweaking how the map is initialized and removeing syserr.