some fixes

fixed stuff