minor server updates, removed lots of debug output, shuffled constructor