Various changes. Getting simple map to display.