diff --git a/config/base.keymap b/config/base.keymap
index a865d2a..f033c4a 100644
--- a/config/base.keymap
+++ b/config/base.keymap
@@ -1,6 +1,6 @@
 /*
 ISSUES, WORKAROUNDS and a "ZMK-WISHLIST"
- * tap-only combos not yet possible (#544), prevents rapid chording of HRMs
+ * no tap-only combos (#544), prevents rapid chording of HRMs on combo positions
  * &bootloader doesn't work with Planck_rev6 (#1086)
  * sticky-hold swallows OS shift when typing quickly, using sticky-tap for now
  * native sleep key doesn't work with windows (#1077), using sleep-macro for now
@@ -38,34 +38,28 @@ ISSUES, WORKAROUNDS and a "ZMK-WISHLIST"
 #define FN 4
 #define UC 5
 
-#define QUICK_TAP_MS 175
-
 #include "combos.dtsi"  // source after layer shortcuts
 #include "mouse.dtsi"
 
-// sticky key config
-&sk {
-    release-after-ms = <550>;  // release after 0.55s
-    quick-release;             // no double capitalization when rolling keys
+#define QUICK_TAP_MS 175
+
+&sk {  // sticky key config
+    release-after-ms = <600>;           // release after 0.6s
+    quick-release;                      // no double capitalization when rolling keys
 };
 
-// sticky layer config
-&sl {
-//    release-after-ms = <550>;  // release after 0.55s
-    ignore-modifiers;             // no double capitalization when rolling keys
+&sl {  // sticky layer config
+    ignore-modifiers;                   // no double capitalization when rolling keys
 };
 
-// layer tap config
-&lt {
+&lt {  // layer tap config
     flavor = "balanced";
     tapping-term-ms = <200>;
-    quick-tap-ms = <QUICK_TAP_MS>;  // double-tap + hold repeats tap-key
-//    global-quick-tap;
+    quick-tap-ms = <QUICK_TAP_MS>;      // double-tap + hold repeats tap-key
 };
 
-// caps word
-&caps_word {
-    /delete-property/ ignore-modifiers;
+&caps_word {  // caps-word config
+    /delete-property/ ignore-modifiers; // mods deactivate caps word, requires PR #1422
 };
 
 /* homerow mods */
@@ -114,7 +108,7 @@ ZMK_BEHAVIOR(win_sleep, macro,
     bindings = <&kp LG(X) &kp U &kp S>;
 )
 
-// Sticky layer + sticky shift
+// Sticky layer + sticky shift (workaround for issue #1421)
 ZMK_BEHAVIOR(uc_shift, macro,
     wait-ms = <0>;
     tap-ms = <1>;
@@ -122,7 +116,6 @@ ZMK_BEHAVIOR(uc_shift, macro,
              , <&macro_pause_for_release>
              , <&macro_release &mo UC &kp LSHFT>;
 )
-
 ZMK_BEHAVIOR(sls, sticky_key,
     release-after-ms = <1000>;
     bindings = <&uc_shift>;