merged with master and fixed env vars for db stuff