few more bugfixes