Add qa, staging, environment improvements