added staging env, small fixes