fix some deffects