fixed remaining chart issues