some fixes

made some fixes