fix some things
some fixes and random deleted things removed