Server Client Config Sync

There were a few config lines that were different on the server.
Mainly, extra commented lines plus a few tweaks that were made recently.