minor improvements to server mode