diff --git a/speaker.py b/speaker.py
index 6ee4ebe6c..4008ec80a 100644
--- a/speaker.py
+++ b/speaker.py
@@ -83,6 +83,7 @@ def _speakerPronounce(baseDir: str, sayText: str, translate: {}) -> str:
             "sql": "S-Q-L",
             "PSQL": "Postgres S-Q-L",
             "SQL": "S-Q-L",
+            "coop": "co-op",
             "KMail": "K-Mail",
             "gmail": "G-mail",
             "Gmail": "G-mail",
@@ -101,6 +102,7 @@ def _speakerPronounce(baseDir: str, sayText: str, translate: {}) -> str:
             ":-)": '. ' + translate["smile"],
             ":-(": '. ' + translate["sad face"],
             ";-)": '. ' + translate["wink"],
+            "?": "? ",
             "*": "",
             "(": ",",
             ")": ","
diff --git a/speaker_client.py b/speaker_client.py
index 8a5be1a73..447a79986 100644
--- a/speaker_client.py
+++ b/speaker_client.py
@@ -25,9 +25,10 @@ def _waitForKeypress(timeout: int, debug: bool) -> str:
     i, o, e = select.select([sys.stdin], [], [], timeout)
 
     if (i):
+        text = sys.stdin.readline().strip()
         if debug:
-            print("Text entered: " + sys.stdin.readline().strip())
-        return sys.stdin.readline().strip()
+            print("Text entered: " + text)
+        return text
     else:
         if debug:
             print("Timeout")