fixes to stencil functions for scc
Merge branch 'overhaul' of darwin:scout into overhaul