fixed some server naming and placement issues