updates to Data class to fix programming errors