set environment variable better
added autocompletion