added contourf and contour
added long to lon/lat formatting