correct differents issues