Single-server mode upgraded and works, not well tested. Minor refactoring.