Moved some aliases to scripts (and improved some)