Improve singular sw
Merge branch 'master' into rosenunstable