Minor modifications
Merge branch 'viz-labels'