updated aliases and a few other things