fix some more stuffs