Creating class to hold water data.  Also misc. bug fixes in Elevation Data class