fixes

some fixes