Single server solution, doc fixes