Improved various aliases.