Server Update

Just to get this full synced with what now runs on the server.
Email might not work, as settings were just changed too keep my server
from throwing errors when sending emails