diff --git a/IRC-MSG.COB b/IRC-MSG.COB
index 79ef1f5..740eb6a 100644
--- a/IRC-MSG.COB
+++ b/IRC-MSG.COB
@@ -8,10 +8,9 @@
 
        LINKAGE SECTION.
        01 BUFFER.
-           03 MSG-LENGTH PIC 9(3).
-           03 MSG-BODY PIC X(512).
-           03 MSG-BODY-1 REDEFINES MSG-BODY PIC X.
-               88 HAS-PREFIX VALUE ";".
+           03 MSG-BODY PIC X(999).
+           03 MSG-BODY-1 REDEFINES MSG-BODY PIC X(6).
+               88 HAS-PREFIX VALUE "$COLN$".
        01 IRC-MESSAGE.
            03 PREFIX.
                05 NICK PIC X(16).
@@ -21,8 +20,8 @@
            03 PARAMETERS.
                05 TARGET PIC X(50).
                05 REST PIC X(480).
-               05 REST-PREFIX REDEFINES REST PIC X.
-                   88 REST-PARAM VALUE ";".
+               05 REST-PREFIX REDEFINES REST PIC X(6).
+                   88 REST-PARAM VALUE "$COLN$".
 
        PROCEDURE DIVISION USING BUFFER, IRC-MESSAGE.
            MOVE SPACES TO IRC-MESSAGE.
@@ -41,19 +40,19 @@
                WITH POINTER MSG-POINTER.
            IF REST-PARAM THEN
                MOVE REST TO WORK
-               MOVE 2 TO MSG-POINTER
+               MOVE 7 TO MSG-POINTER
                UNSTRING WORK
                         INTO REST
                         WITH POINTER MSG-POINTER.
 
        WITH-PREFIX.
-           MOVE 2 TO MSG-POINTER.
+           MOVE 7 TO MSG-POINTER.
            UNSTRING MSG-BODY,
                     DELIMITED BY SPACES,
                     INTO WORK,
                     WITH POINTER MSG-POINTER.
            UNSTRING WORK,
-                    DELIMITED BY "!" OR "@",
+                    DELIMITED BY "$EXC$" OR "$AT$",
                     INTO NICK,
                     IDENT,
                     HOST.