diff --git a/atkbd.pio b/atkbd.pio
index a15750a..f8a4d80 100644
--- a/atkbd.pio
+++ b/atkbd.pio
@@ -58,7 +58,7 @@ void atkbd_program_init(PIO pio, int sm, int offset, int base_pin) {
 
     sm_config_set_jmp_pin(&c, base_pin + 1);
 
-    sm_config_set_clkdiv(&c, clock_get_hz(clk_sys) / 8000000); // 8 MHz
+    sm_config_set_clkdiv(&c, clock_get_hz(clk_sys) / 100000); // 300kHz
 
     // Set this pin's GPIO function (connect PIO to the pad)
     pio_gpio_init(pio, base_pin);
diff --git a/chargen.c b/chargen.c
index aa67397..8eb46fb 100644
--- a/chargen.c
+++ b/chargen.c
@@ -23,6 +23,7 @@
 #include "vga_660x477_60.pio.h"
 
 #include "lw_terminal_vt100.h"
+#define DEBUG(...) ((void)0)
 
 int pixels_sm;
 
@@ -451,6 +452,7 @@ static int stdio_kbd_in_chars(char *buf, int length) {
     int code;
     keyboard_poll(&keyboard_queue);
     while (length && queue_try_remove(&keyboard_queue, &code)) {
+        DEBUG("code=%04x\r\n", code);
         if ((code & 0xc000) == 0xc000) {
             switch (code) {
             case CMD_SWITCH_RATE:
@@ -606,9 +608,9 @@ int main(void) {
 
     port_activate();
 
-    if (keyboard_setup(pio1)) {
-        queue_init(&keyboard_queue, sizeof(int), 64);
-        // stdio_set_driver_enabled(&stdio_kbd, true);
+    queue_init(&keyboard_queue, sizeof(int), 64);
+    if (!keyboard_setup(pio1)) {
+        scrnprintf("KEYBOARD INIT FAILED\r\n");
     }
 
     scrnprintf("\033[H\033[J\r\n ** \033[1mCR100 Terminal \033[7m READY \033[m "
diff --git a/keyboard.c b/keyboard.c
index c1202b3..b51f24f 100644
--- a/keyboard.c
+++ b/keyboard.c
@@ -8,6 +8,7 @@
 #include "pico/stdlib.h"
 
 #define EOF (-1)
+#define DEBUG(...) ((void)0)
 
 static int pending_led_value;
 static bool pending_led_flag;
@@ -60,22 +61,27 @@ static bool write_expect_fa(int value, const char *msg) {
     return expect(0xfa, msg);
 }
 bool keyboard_setup(PIO pio) {
+    DEBUG("pre-waiting for keyboard to boot\r");
+    sleep_ms(1600);
+
     gpio_init(KEYBOARD_DATA_PIN);
     gpio_init(KEYBOARD_DATA_PIN + 1);
 
-    gpio_pull_down(KEYBOARD_DATA_PIN);
-    gpio_pull_down(KEYBOARD_DATA_PIN + 1);
+    gpio_pull_up(KEYBOARD_DATA_PIN);
+    gpio_pull_up(KEYBOARD_DATA_PIN + 1);
 
+#if 0
     int i = 0, j = 1;
     while (!(gpio_get(KEYBOARD_DATA_PIN) && gpio_get(KEYBOARD_DATA_PIN + 1))) {
         if (i++ == j) {
-            scrnprintf("Waiting for keyboard to boot... %d ms so far\r", i);
+            DEBUG("Waiting for keyboard to boot... %d ms so far\r", i);
             j *= 10;
         }
         sleep_ms(1);
     }
 
-    sleep_ms(10);
+    sleep_ms(100);
+#endif
 
     kbd_pio = pio;
     uint offset = pio_add_program(pio, &atkbd_program);
@@ -270,6 +276,8 @@ static void queue_add_str(queue_t *q, const char *s) {
 
 static void queue_handle_event(queue_t *q, bool release, int value) {
     int modifiers = keyboard_modifiers[value];
+    DEBUG("queue_handle_event release=%d value=%d modifiers=%d\r\n", release,
+          value, modifiers);
     if (modifiers) {
         if (release) {
             if (modifiers & TOGGLING_MODIFIERS) {
@@ -299,6 +307,10 @@ static void queue_handle_event(queue_t *q, bool release, int value) {
     bool is_caps = current_modifiers & (MOD_CAPS);
 
     int kc = keyboard_codes[value];
+
+    DEBUG("kc=%04x is_[scaX] = %d %d %d %d\r\n", kc, is_shift, is_ctrl, is_alt,
+          is_caps);
+
     if (!kc) {
         scrnprintf("\r\nUn-mapped key: 0x%02x\r\n", value);
         return;
@@ -331,7 +343,7 @@ static void queue_handle_event(queue_t *q, bool release, int value) {
     }
 
     int c = LO(kc);
-    // scrnprintf("c=%d HI=%d is_shift=%d\n", c, HI(kc), is_shift);
+    // DEBUG("c=%d HI=%d is_shift=%d\n", c, HI(kc), is_shift);
     if (HI(kc) && is_shift)
         c = HI(kc);
 #define CTRLABLE(c) (c >= 64 && c <= 127)
@@ -353,9 +365,12 @@ static void queue_handle_event(queue_t *q, bool release, int value) {
 
 void keyboard_poll(queue_t *q) {
     int value = kbd_read_timeout(0);
+
     if (value == EOF) {
         return;
-    } else if (value == 0xfa) {
+    }
+    DEBUG("keyboard_poll %02x\r\n", value);
+    if (value == 0xfa) {
         if (pending_led_flag) {
             kbd_write_blocking(pending_led_value);
             pending_led_flag = false;
@@ -372,7 +387,7 @@ int keyboard_leds;
 
 void keyboard_set_leds(int value) {
     keyboard_leds = value;
-    return;
+    // return;
     if (value != pending_led_value) {
         pending_led_value = value;
         pending_led_flag = true;
diff --git a/keyboard.h b/keyboard.h
index a4a44d6..98b6ade 100644
--- a/keyboard.h
+++ b/keyboard.h
@@ -14,5 +14,5 @@ extern bool keyboard_setup(PIO pio);
 extern void keyboard_poll(queue_t *q);
 extern void keyboard_set_leds(int value);
 extern void atkbd_program_init(PIO pio, int sm, int offset, int base_pin);
-enum { LED_NUM = 4, LED_CAPS = 2 };
+enum { LED_NUM = 2, LED_CAPS = 4 };
 extern int keyboard_leds;