fixed more stuffs