Sorting working and a few tweaks added