support for singeled matches, bugfixes