Fix aliases and add some new