More aliases and some typos