changed some aliases
much better
cleaned things up