final server changes
minor changes