diff --git a/src/Mima/Format/Common.hs b/src/Mima/Format/Common.hs
index 408ea82..d795361 100644
--- a/src/Mima/Format/Common.hs
+++ b/src/Mima/Format/Common.hs
@@ -39,7 +39,7 @@ chunkyBin :: T.Text -> T.Text
 chunkyBin = chunkedBy " " 4
 
 chunkyDec :: T.Text -> T.Text
-chunkyDec = chunkedBy "'" 3
+chunkyDec = chunkedBy " " 3
 
 chunkyHex :: T.Text -> T.Text
 chunkyHex = chunkedBy " " 2
diff --git a/src/Mima/Format/State.hs b/src/Mima/Format/State.hs
index 0da1b24..41e5fee 100644
--- a/src/Mima/Format/State.hs
+++ b/src/Mima/Format/State.hs
@@ -92,7 +92,8 @@ fFlags a = do
       f = feFlags env
       memoryFlags   = if fcShowMemoryFlags   conf then fMemoryFlags   f a else ""
       registerFlags = if fcShowRegisterFlags conf then fRegisterFlags s a else ""
-  pure $ memoryFlags <> registerFlags
+      space = if fcShowMemoryFlags conf || fcShowRegisterFlags conf then " " else ""
+  pure $ memoryFlags <> registerFlags <> space
 
 {- Addresses -}
 
@@ -146,7 +147,7 @@ fMemoryLn a = do
   flags <- fFlags a
   addr <- fAddress a
   word <- fWord w
-  pure $ flags <> " " <> addr <> " " <> word <> "\n"
+  pure $ flags <> addr <> " " <> word <> "\n"
 
 interestingAddresses :: FormatReader (Set.Set MimaAddress)
 interestingAddresses = do
@@ -166,7 +167,7 @@ getAddresses = do
     then do
       interesting <- interestingAddresses
       pure $ Set.toAscList $ Set.union interesting $ Set.fromList $ usedAddresses mem
-    else pure $ usedAddresses mem
+    else pure $ continuousUsedAddresses mem
 
 fMemory :: Formatter
 fMemory = do