DataSet refactored + some other small changes.