fix few thing