fixed data access issues, could other little things