closes #150, and additional tweaks for multi server support