Server Update

Touched up code in server