added some server changes
fixed merge conflicts