sorted a few thing