Mm print 2

See the commit messages.
There may be slight room for discussion, but I think it's pretty fine now.