simhit matcher updates and various fixes

Hi Sven
please include these updates.
See the descriptions in the commit messages.