working on data access layer, minor changes