more fixes, final?