fixed selection issues in DataSet. Started work on Variables.