changing aliases and adding comments