Some fixes

Couple of obvious fixes and increased frequency of match checking for
presentation purposes.