fixed a few thing