Changes to aliases and adding some docs