Update smoothing demo
Merge branch 'chris/refinement-cleanup' into next