fix stuffs, add somethin