get rid of unnecessary PrintDefaults in paste
more (minor) cleanup in paste
Merge branch '21-misc-cleanup' into 23
substr cleanup and bug fix, mods update
Merge branch '21-misc-cleanup' into 23