results of today's hacking: sketch for match interpretation and a few more minor things

review @dedoz @Lugzan @densh