diff --git a/flash.sh b/flash.sh
index e66e9b2d09..8c1d3e0c71 100644
--- a/flash.sh
+++ b/flash.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 [ -z "$1" ] && exit 1
-doas avrdude -p atmega32u4 -c avr109 -U flash:w:"$1"
+avrdude -p atmega32u4 -P /dev/ttyACM0 -c avr109 -U flash:w:"$1"
diff --git a/keyboards/crkbd/keymaps/default/keymap.c b/keyboards/crkbd/keymaps/default/keymap.c
index d59253e283..23b2beac8f 100644
--- a/keyboards/crkbd/keymaps/default/keymap.c
+++ b/keyboards/crkbd/keymaps/default/keymap.c
@@ -47,11 +47,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [1] = LAYOUT(
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      _______, XXXXXXX,    KC_7,    KC_8,    KC_9, KC_HOME,                      KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+      _______, KC_COMM,    KC_7,    KC_8,    KC_9, KC_HOME,                      KC_PGUP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______, XXXXXXX,    KC_4,    KC_5,    KC_6,  KC_END,                      KC_PGDN, KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, XXXXXXX,
+      _______,  KC_DOT,    KC_4,    KC_5,    KC_6,  KC_END,                      KC_PGDN, KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      _______,    KC_0,    KC_1,    KC_2,    KC_3, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
+      _______,    KC_0,    KC_1,    KC_2,    KC_3, KC_CIRC,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
                                           _______, _______, _______,    _______, _______, _______
                                       //`--------------------------'  `--------------------------'
@@ -81,15 +81,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                       //`--------------------------'  `--------------------------'
   ),
 
-    [4] = LAYOUT(
+    [4] = LAYOUT( // 1-5 mapped on G604 side buttons, melee is scroll wheel down
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    KC_G,                         KC_5,    KC_4,    KC_3,    KC_2,    KC_1,   TO(0),
+        TO(0),    KC_0,    KC_Q,    KC_W, KC_LCTL,    KC_R,                        TO(0), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   TO(0),
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    KC_H,                         KC_Q,    KC_E,    KC_W,    KC_F,    KC_X,  KC_TAB,
+       KC_TAB,    KC_T,    KC_A,    KC_S,    KC_D,    KC_G,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    KC_I,                         KC_R,    KC_A,    KC_S,    KC_D, KC_LSFT, KC_LCTL,
+       KC_ESC, KC_LSFT,    KC_9,    KC_X,    KC_M,    KC_8,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          XXXXXXX,    KC_V,  KC_ESC,     KC_SPC,    KC_M,  KC_ESC
+                                             KC_7,    KC_6,  KC_SPC,    XXXXXXX, XXXXXXX, XXXXXXX
                                       //`--------------------------'  `--------------------------'
   )
 };