a few more bugfixes