SORT_MODE is now loaded correctly + some other improvements.