some fixes, now working again
some fixes, now working again(2)