Update option to pass settings to server, minor fixes