some cleanup, bug fixes and improvements to the Data class
more cleanup, some more Data tests added