fix some little bugs & others things