Possibly fixed stuff.
Updated example config.
Merge remote-tracking branch 'origin/master' into main-server