some more bugfixes

sas