This is from my Wayfarer1 branch - simply because the newly rebased one still has issues to be sorted out.

@NewSense: I've made a note of your printing issues. Will sort these out for Wayfarer 2.0 release.