sort and little changes