switch to qa env and some changes