Data_validation

Added data_validation & fixed up controller bug