more changes to get closer to chart and stream editor integration...getting close