fleshed out server
just some changes