fixed some utilities and data access and other stuff