minor changes
pull and merge for Jack's updated server