added more aliases and changed diff algorithm