Fixed some aliases

And added some nicks