bug fixes and refinement for new server model