diff --git a/src/rds.c b/src/rds.c
index 21971c2..1585c5e 100644
--- a/src/rds.c
+++ b/src/rds.c
@@ -274,23 +274,6 @@ static void get_rds_ps_group(RDSEncoder* enc, uint16_t *blocks) {
 								memcpy(enc->state[enc->program].ps_text, &(enc->state[enc->program].dps1_text[enc->state[enc->program].dynamic_ps_position]), PS_LENGTH);
 								enc->state[enc->program].dynamic_ps_position++;
 								break;
-							case 2:
-								memcpy(enc->state[enc->program].ps_text, &(enc->state[enc->program].dps1_text[enc->state[enc->program].dynamic_ps_position]), PS_LENGTH);
-								uint8_t next_position = 0;
-								if (enc->state[enc->program].dynamic_ps_position + PS_LENGTH < enc->data[enc->program].dps1_len) {
-									next_position = enc->state[enc->program].dynamic_ps_position + PS_LENGTH;
-									for (int i = 0; i < PS_LENGTH; i++) {
-										if (enc->state[enc->program].dynamic_ps_position + i < enc->data[enc->program].dps1_len &&
-											enc->state[enc->program].dps1_text[enc->state[enc->program].dynamic_ps_position + i] == ' ') {
-											next_position = enc->state[enc->program].dynamic_ps_position + i + 1;
-											break;
-										}
-									}
-								} else {
-									next_position = 0;
-								}
-								enc->state[enc->program].dynamic_ps_position = next_position;
-								break;
 						}
 						enc->state[enc->program].dynamic_ps_scroll_counter = 0;
 					} else {
@@ -334,23 +317,6 @@ static void get_rds_ps_group(RDSEncoder* enc, uint16_t *blocks) {
 								memcpy(enc->state[enc->program].ps_text, &(enc->state[enc->program].dps1_nexttext[enc->state[enc->program].dynamic_ps_position]), PS_LENGTH);
 								enc->state[enc->program].dynamic_ps_position++;
 								break;
-							case 2:
-								memcpy(enc->state[enc->program].ps_text, &(enc->state[enc->program].dps1_nexttext[enc->state[enc->program].dynamic_ps_position]), PS_LENGTH);
-								uint8_t next_position = 0;
-								if (enc->state[enc->program].dynamic_ps_position + PS_LENGTH < enc->data[enc->program].dps1_len) {
-									next_position = enc->state[enc->program].dynamic_ps_position + PS_LENGTH;
-									for (int i = 0; i < PS_LENGTH; i++) {
-										if (enc->state[enc->program].dynamic_ps_position + i < enc->data[enc->program].dps1_len &&
-											enc->state[enc->program].dps1_nexttext[enc->state[enc->program].dynamic_ps_position + i] == ' ') {
-											next_position = enc->state[enc->program].dynamic_ps_position + i + 1;
-											break;
-										}
-									}
-								} else {
-									next_position = 0;
-								}
-								enc->state[enc->program].dynamic_ps_position = next_position;
-								break;
 						}
 						enc->state[enc->program].dynamic_ps_scroll_counter = 0;
 					} else {
diff --git a/supported_cmds.txt b/supported_cmds.txt
index d46290e..aae35da 100644
--- a/supported_cmds.txt
+++ b/supported_cmds.txt
@@ -1,18 +1,18 @@
 AF
 AFCH
 DI
-- DPS1
-- DPS1EN
+DPS1
+DPS1EN
 - DPS2EN
-- DPS1ENQ
+DPS1ENQ
 - DPS2
-- DPS1MOD
+DPS1MOD (partial)
 - DPS2MOD
 - DPS1REP
 - DPS2REP
 - DTTMOUT
 - EQTEXT1
-- LABPER
+LABPER
 MS
 PI
 PS
@@ -26,8 +26,8 @@ RT1EN
 - RTPER
 - RTTYPE
 - RSTDPS
-- SCRLSPD
-- SPSPER
+SCRLSPD
+SPSPER
 TA
 - TATMOUT
 TP
@@ -121,16 +121,16 @@ Magic RDS 4 Pages for PIRA32:
             - RT1 Enabled
             - RT2 Enabled (TODO:)
             - Radiotext Type Bit (TODO: RTTYPE)
-        - Dynamic PS (TODO:):
+        - Dynamic PS:
             - DPS1 Text
             - DPS1 Setup:
                 - DPS1 Enabled (Default: 0)
-                - DPS1 Mode (Default: 1)
-                - DPS1 Number of repeats (Default: 0, options: CLEAR)
-            - DPS2:
+                - DPS1 Mode (Default: 1) (TODO: 2 and 3)
+                - DPS1 Number of repeats (Default: 0, options: CLEAR) (TODO:)
+            - DPS2 (TODO:):
                 - DPS2 Text
                 - DPS2 Source (Default: 0, manual)
-            - DPS Setup:
+            - DPS Setup (TODO:):
                 - DPS2 Enabled (Default: 0)
                 - DPS2 Mode (Default: 2)
                 - DPS2 Number of repeats (Default: 0)
@@ -138,7 +138,7 @@ Magic RDS 4 Pages for PIRA32:
                 - Static PS period (Default: 16)
                 - DPS String Period (LABPER, Default: 0)
                 - Scrolling Speed (modes 0-3 Default: low)
-                - Restart DPS on change (options: Only if it's running, Always | first is Default)
+                - Restart DPS on change (options: Only if it's running, Always | first is Default) (TODO:)
     - Alternative Frequency:
         - AF Method (TODO: AF=A, AF=B)
         ; A: