some fixes
some fixes II