Sorted & some fixes