Added a few more aliases / changed comments