fixed remaining issues with data display.