some improvements to paste
more improvements to paste
Merge branch '21-misc-cleanup' into 22