fix some things gah