diff --git a/src/connection.ts b/src/connection.ts
index 0703668af..fbb0f3221 100644
--- a/src/connection.ts
+++ b/src/connection.ts
@@ -357,6 +357,82 @@ export default class Connection {
   getOption(name: string): any {
     return this._options[name];
   }
+
+  setOption(name: string, value: any) {
+    this._options[name] = value;
+  }
+
+  inputKey() { // name: string, x: number, y: number, alt: Boolean, ctrl: Boolean, shift: Boolean, command: Boolean) {
+  }
+
+  inputString(seq: string) {
+    const keyEvent = message.KeyEvent.fromPartial({ seq });
+    this._ws?.sendMessage({ keyEvent });
+  }
+
+  inputMouse(mask: number, x: number, y: number, alt: Boolean, ctrl: Boolean, shift: Boolean, command: Boolean) {
+    const mouseEvent = message.MouseEvent.fromPartial({ mask, x, y });
+    if (alt) mouseEvent.modifiers.push(message.ControlKey.Alt);
+    if (ctrl) mouseEvent.modifiers.push(message.ControlKey.Control);
+    if (shift) mouseEvent.modifiers.push(message.ControlKey.Shift);
+    if (command) mouseEvent.modifiers.push(message.ControlKey.Meta);
+    this._ws?.sendMessage({ mouseEvent });
+  }
+
+  toggleOption(name: string) {
+    const v = !this._options[name];
+    const option = message.OptionMessage.fromPartial({});
+    const v2 = v ? message.OptionMessage_BoolOption.Yes : message.OptionMessage_BoolOption.No;
+    switch (name) {
+      case 'show-remote-cursor':
+        option.showRemoteCursor = v2;
+        break;
+      case 'disable-audio':
+        option.disableAudio = v2;
+        break;
+      case 'disable-clipboard':
+        option.disableClipboard = v2;
+        break;
+      case 'lock-after-session-end':
+        option.lockAfterSessionEnd = v2;
+        break;
+      case 'privacy-mode':
+        option.privacyMode = v2;
+        break;
+      case 'block-input':
+        option.blockInput = message.OptionMessage_BoolOption.Yes;
+        break;
+      case 'unblock-input':
+        option.blockInput = message.OptionMessage_BoolOption.No;
+        break;
+      default:
+        return;
+    }
+    if (name.indexOf('block-input') < 0) this.setOption(name, v);
+    const misc = message.Misc.fromPartial({ option });
+    this._ws?.sendMessage({ misc });
+  }
+
+  getImageQualityEnum(value: string, ignoreDefault: Boolean): message.ImageQuality | undefined {
+    switch (value) {
+      case 'low':
+        return message.ImageQuality.Low;
+      case 'best':
+        return message.ImageQuality.Best;
+      case 'balanced':
+        return ignoreDefault ? undefined : message.ImageQuality.Balanced;
+      default:
+        return undefined;
+    }
+  }
+
+  setImageQuality(value: string) {
+    const imageQuality = this.getImageQualityEnum(value, false);
+    if (imageQuality == undefined) return;
+    const option = message.OptionMessage.fromPartial({ imageQuality });
+    const misc = message.Misc.fromPartial({ option });
+    this._ws?.sendMessage({ misc });
+  }
 }
 
 // @ts-ignore
diff --git a/src/globals.js b/src/globals.js
index ba1be3f9d..3aaf6685c 100644
--- a/src/globals.js
+++ b/src/globals.js
@@ -54,8 +54,9 @@ function jsonfyForDart(payload) {
 
 export function pushEvent(name, payload) {
   if (!events) return;
+  payload = jsonfyForDart(payload);
   payload.name = name;
-  events.push(jsonfyForDart(payload));
+  events.push(payload);
 }
 
 export function draw(frame) {
@@ -242,7 +243,7 @@ window.setByName = (name, value) => {
       localStorage.setItem(value.name, value.value);
       break;
     case 'peer_option':
-      curConn.setPeerOption(value.name, value.value);
+      curConn.setOption(value.name, value.value);
       break;
     case 'input_os_password':
       curConn.inputOsPassword(value, true);