update to staging, fix server