additional fixes

made some fixes