Add alias suggestion, general update