Improve scenario pretty-printing
Fix various printing related features