some fixes

push plz