minor fixes
fix server bugs