slight server edits