   lcd.write("1:\x01");
   wait(10);
 
-  // Test print and goto
+  // Test print and gotoXY
   // Expected screen: "Hi there"
   //                  "12345678"
   lcd.clear();

  wait(90);

  // Test scrollDisplayLeft.
  // Expected screen: "i there " (with a blinking cursor on the second column)
  //                  "23456789"
  lcd.scrollDisplayLeft();
  wait(100);

  // Test scrollDisplayLeft.
  // Expected screen: " there  " (with a blinking cursor on the first column)
  //                  "3456789a"
  lcd.scrollDisplayLeft();
  wait(110);

  // Test scrollDisplayRight.
  // Expected screen: "i there " (with a blinking cursor on the second column)
  //                  "23456789"
  lcd.scrollDisplayRight();
  wait(120);

  // Test home.
  // Expected screen: "Hi there" (with a blinking cursor over H)
  //                  "12345678"
  lcd.home();
  wait(130);

  // Test clear().  The screen should be empty except for a blinking cursor in the upper left.
  lcd.clear();
  wait(140);

  // Test leftToRight and rightToLeft
  // Expected screen: "abcdef  "
  //                  "        "
  lcd.print("abXX");
  lcd.rightToLeft();
  lcd.print("Xdc");

    };
    lcd.loadCustomCharacter(smiley, 0);

    // Make sure that old code that uses 'char' for the pictures
    // still works because the OrangutanLCD function took char*
    // instead of uint8_t*.
    static const char back_arrow[] PROGMEM = {
	0b00000,
	0b00010,
