fixing more stuffs