Minor cleanup
Improved con_server, dis_server