Add sorting
Modify/remove some aliases