conf: updated environment variable names to make more sense
bin: bug fixes and env name updates