Rearranged alias file and added some new ones