diff --git a/micropython/modules/breakout_colourlcd160x80/breakout_colourlcd160x80.cpp b/micropython/modules/breakout_colourlcd160x80/breakout_colourlcd160x80.cpp
index 737fcb0f..47f9092c 100644
--- a/micropython/modules/breakout_colourlcd160x80/breakout_colourlcd160x80.cpp
+++ b/micropython/modules/breakout_colourlcd160x80/breakout_colourlcd160x80.cpp
@@ -396,14 +396,9 @@ mp_obj_t BreakoutColourLCD160x80_character(size_t n_args, const mp_obj_t *pos_ar
     int c = mp_obj_get_int(args[ARG_char].u_obj);
     int x = args[ARG_x].u_int;
     int y = args[ARG_y].u_int;
+    int scale = args[ARG_scale].u_int;
 
-    Point p(x, y);
-    if(n_args == 4) {
-        int scale = args[ARG_scale].u_int;
-        self->breakout->character((char)c, p, scale);
-    }
-    else
-        self->breakout->character((char)c, p);
+    self->breakout->character((char)c, Point(x, y), scale);
 
     return mp_const_none;
 }
@@ -415,7 +410,7 @@ mp_obj_t BreakoutColourLCD160x80_text(size_t n_args, const mp_obj_t *pos_args, m
         { MP_QSTR_text, MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_x1, MP_ARG_REQUIRED | MP_ARG_INT },
         { MP_QSTR_y1, MP_ARG_REQUIRED | MP_ARG_INT },
-        { MP_QSTR_wr, MP_ARG_REQUIRED | MP_ARG_INT },
+        { MP_QSTR_wordwrap, MP_ARG_REQUIRED | MP_ARG_INT },
         { MP_QSTR_scale, MP_ARG_INT, {.u_int = 2} },
     };
 
@@ -424,22 +419,31 @@ mp_obj_t BreakoutColourLCD160x80_text(size_t n_args, const mp_obj_t *pos_args, m
 
     breakout_colourlcd160x80_BreakoutColourLCD160x80_obj_t *self = MP_OBJ_TO_PTR2(args[ARG_self].u_obj, breakout_colourlcd160x80_BreakoutColourLCD160x80_obj_t);
 
-    mp_check_self(mp_obj_is_str_or_bytes(args[ARG_text].u_obj));
-    GET_STR_DATA_LEN(args[ARG_text].u_obj, str, str_len);
+    mp_obj_t text_obj = args[ARG_text].u_obj;
+    if(mp_obj_is_str_or_bytes(text_obj)) {
+        GET_STR_DATA_LEN(text_obj, str, str_len);
 
-    std::string t((const char*)str);
+        std::string t((const char*)str);
 
-    int x = args[ARG_x].u_int;
-    int y = args[ARG_y].u_int;
-    int wrap = args[ARG_wrap].u_int;
-
-    Point p(x, y);
-    if(n_args == 5) {
+        int x = args[ARG_x].u_int;
+        int y = args[ARG_y].u_int;
+        int wrap = args[ARG_wrap].u_int;
         int scale = args[ARG_scale].u_int;
-        self->breakout->text(t, p, wrap, scale);
+
+        self->breakout->text(t, Point(x, y), wrap, scale);
+    }
+    else if(mp_obj_is_float(text_obj)) {
+        mp_raise_TypeError("can't convert 'float' object to str implicitly");
+    }
+    else if(mp_obj_is_int(text_obj)) {
+        mp_raise_TypeError("can't convert 'int' object to str implicitly");
+    }
+    else if(mp_obj_is_bool(text_obj)) {
+        mp_raise_TypeError("can't convert 'bool' object to str implicitly");
+    }
+    else {
+        mp_raise_TypeError("can't convert object to str implicitly");
     }
-    else
-        self->breakout->text(t, p, wrap);
 
     return mp_const_none;
 }
diff --git a/micropython/modules/breakout_colourlcd240x240/breakout_colourlcd240x240.cpp b/micropython/modules/breakout_colourlcd240x240/breakout_colourlcd240x240.cpp
index 8e7cab85..56650064 100644
--- a/micropython/modules/breakout_colourlcd240x240/breakout_colourlcd240x240.cpp
+++ b/micropython/modules/breakout_colourlcd240x240/breakout_colourlcd240x240.cpp
@@ -396,14 +396,9 @@ mp_obj_t BreakoutColourLCD240x240_character(size_t n_args, const mp_obj_t *pos_a
     int c = mp_obj_get_int(args[ARG_char].u_obj);
     int x = args[ARG_x].u_int;
     int y = args[ARG_y].u_int;
+    int scale = args[ARG_scale].u_int;
 
-    Point p(x, y);
-    if(n_args == 4) {
-        int scale = args[ARG_scale].u_int;
-        self->breakout->character((char)c, p, scale);
-    }
-    else
-        self->breakout->character((char)c, p);
+    self->breakout->character((char)c, Point(x, y), scale);
 
     return mp_const_none;
 }
@@ -415,7 +410,7 @@ mp_obj_t BreakoutColourLCD240x240_text(size_t n_args, const mp_obj_t *pos_args,
         { MP_QSTR_text, MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_x1, MP_ARG_REQUIRED | MP_ARG_INT },
         { MP_QSTR_y1, MP_ARG_REQUIRED | MP_ARG_INT },
-        { MP_QSTR_wr, MP_ARG_REQUIRED | MP_ARG_INT },
+        { MP_QSTR_wordwrap, MP_ARG_REQUIRED | MP_ARG_INT },
         { MP_QSTR_scale, MP_ARG_INT, {.u_int = 2} },
     };
 
@@ -424,22 +419,31 @@ mp_obj_t BreakoutColourLCD240x240_text(size_t n_args, const mp_obj_t *pos_args,
 
     breakout_colourlcd240x240_BreakoutColourLCD240x240_obj_t *self = MP_OBJ_TO_PTR2(args[ARG_self].u_obj, breakout_colourlcd240x240_BreakoutColourLCD240x240_obj_t);
 
-    mp_check_self(mp_obj_is_str_or_bytes(args[ARG_text].u_obj));
-    GET_STR_DATA_LEN(args[ARG_text].u_obj, str, str_len);
+    mp_obj_t text_obj = args[ARG_text].u_obj;
+    if(mp_obj_is_str_or_bytes(text_obj)) {
+        GET_STR_DATA_LEN(text_obj, str, str_len);
 
-    std::string t((const char*)str);
+        std::string t((const char*)str);
 
-    int x = args[ARG_x].u_int;
-    int y = args[ARG_y].u_int;
-    int wrap = args[ARG_wrap].u_int;
-
-    Point p(x, y);
-    if(n_args == 5) {
+        int x = args[ARG_x].u_int;
+        int y = args[ARG_y].u_int;
+        int wrap = args[ARG_wrap].u_int;
         int scale = args[ARG_scale].u_int;
-        self->breakout->text(t, p, wrap, scale);
+
+        self->breakout->text(t, Point(x, y), wrap, scale);
+    }
+    else if(mp_obj_is_float(text_obj)) {
+        mp_raise_TypeError("can't convert 'float' object to str implicitly");
+    }
+    else if(mp_obj_is_int(text_obj)) {
+        mp_raise_TypeError("can't convert 'int' object to str implicitly");
+    }
+    else if(mp_obj_is_bool(text_obj)) {
+        mp_raise_TypeError("can't convert 'bool' object to str implicitly");
+    }
+    else {
+        mp_raise_TypeError("can't convert object to str implicitly");
     }
-    else
-        self->breakout->text(t, p, wrap);
 
     return mp_const_none;
 }
diff --git a/micropython/modules/breakout_roundlcd/breakout_roundlcd.cpp b/micropython/modules/breakout_roundlcd/breakout_roundlcd.cpp
index 3bb64895..c84ce05c 100644
--- a/micropython/modules/breakout_roundlcd/breakout_roundlcd.cpp
+++ b/micropython/modules/breakout_roundlcd/breakout_roundlcd.cpp
@@ -396,14 +396,9 @@ mp_obj_t BreakoutRoundLCD_character(size_t n_args, const mp_obj_t *pos_args, mp_
     int c = mp_obj_get_int(args[ARG_char].u_obj);
     int x = args[ARG_x].u_int;
     int y = args[ARG_y].u_int;
+    int scale = args[ARG_scale].u_int;
 
-    Point p(x, y);
-    if(n_args == 4) {
-        int scale = args[ARG_scale].u_int;
-        self->breakout->character((char)c, p, scale);
-    }
-    else
-        self->breakout->character((char)c, p);
+    self->breakout->character((char)c, Point(x, y), scale);
 
     return mp_const_none;
 }
@@ -415,7 +410,7 @@ mp_obj_t BreakoutRoundLCD_text(size_t n_args, const mp_obj_t *pos_args, mp_map_t
         { MP_QSTR_text, MP_ARG_REQUIRED | MP_ARG_OBJ },
         { MP_QSTR_x1, MP_ARG_REQUIRED | MP_ARG_INT },
         { MP_QSTR_y1, MP_ARG_REQUIRED | MP_ARG_INT },
-        { MP_QSTR_wr, MP_ARG_REQUIRED | MP_ARG_INT },
+        { MP_QSTR_wordwrap, MP_ARG_REQUIRED | MP_ARG_INT },
         { MP_QSTR_scale, MP_ARG_INT, {.u_int = 2} },
     };
 
@@ -433,14 +428,9 @@ mp_obj_t BreakoutRoundLCD_text(size_t n_args, const mp_obj_t *pos_args, mp_map_t
         int x = args[ARG_x].u_int;
         int y = args[ARG_y].u_int;
         int wrap = args[ARG_wrap].u_int;
+        int scale = args[ARG_scale].u_int;
 
-        Point p(x, y);
-        if(n_args == 5) {
-            int scale = args[ARG_scale].u_int;
-            self->breakout->text(t, p, wrap, scale);
-        }
-        else
-            self->breakout->text(t, p, wrap);
+        self->breakout->text(t, Point(x, y), wrap, scale);
     }
     else if(mp_obj_is_float(text_obj)) {
         mp_raise_TypeError("can't convert 'float' object to str implicitly");