Added some aliases & env vars