diff --git a/src/main/java/de/platon42/intellij/plugins/m68k/asm/M68kIsa.kt b/src/main/java/de/platon42/intellij/plugins/m68k/asm/M68kIsa.kt
index 44e4302..92ea17d 100644
--- a/src/main/java/de/platon42/intellij/plugins/m68k/asm/M68kIsa.kt
+++ b/src/main/java/de/platon42/intellij/plugins/m68k/asm/M68kIsa.kt
@@ -258,7 +258,7 @@ object M68kIsa {
             "movem", "Move Multiple Registers",
             modes = listOf(
                 AllowedAdrMode(
-                    setOf(AddressMode.REGISTER_LIST),
+                    setOf(AddressMode.REGISTER_LIST, AddressMode.ADDRESS_REGISTER_DIRECT, AddressMode.DATA_REGISTER_DIRECT),
                     setOf(
                         AddressMode.ADDRESS_REGISTER_INDIRECT,
                         AddressMode.ADDRESS_REGISTER_INDIRECT_PRE_DEC,
@@ -275,9 +275,11 @@ object M68kIsa {
                         AddressMode.ADDRESS_REGISTER_INDIRECT_POST_INC,
                         AddressMode.ADDRESS_REGISTER_INDIRECT_WITH_DISPLACEMENT,
                         AddressMode.ADDRESS_REGISTER_INDIRECT_WITH_INDEX,
-                        AddressMode.ABSOLUTE_ADDRESS
+                        AddressMode.ABSOLUTE_ADDRESS,
+                        AddressMode.PROGRAM_COUNTER_INDIRECT_WITH_DISPLACEMENT,
+                        AddressMode.PROGRAM_COUNTER_INDIRECT_WITH_INDEX
                     ),
-                    setOf(AddressMode.REGISTER_LIST),
+                    setOf(AddressMode.REGISTER_LIST, AddressMode.ADDRESS_REGISTER_DIRECT, AddressMode.DATA_REGISTER_DIRECT),
                     OP_SIZE_WL,
                     modInfo = RWM_READ_OP1_OPSIZE or RWM_SET_OP2_OPSIZE
                 ),
diff --git a/src/main/java/de/platon42/intellij/plugins/m68k/lexer/M68kLexerPrefs.kt b/src/main/java/de/platon42/intellij/plugins/m68k/lexer/M68kLexerPrefs.kt
index be7dca3..fff25fa 100644
--- a/src/main/java/de/platon42/intellij/plugins/m68k/lexer/M68kLexerPrefs.kt
+++ b/src/main/java/de/platon42/intellij/plugins/m68k/lexer/M68kLexerPrefs.kt
@@ -2,7 +2,7 @@ package de.platon42.intellij.plugins.m68k.lexer
 
 data class M68kLexerPrefs(
     var spaceIntroducesComment: Boolean = false,
-    var maxLinesPerMacro: Int = 50,
+    var maxLinesPerMacro: Int = 250,
     var macroSectionUnparsed: Boolean = false,
     var macroParametersUnparsed: Boolean = true
 )
\ No newline at end of file