Updated/added aliaes, trying to add more color.