Added some more aliases. Need to debug them.