diff --git a/midi.cabal b/midi.cabal
--- a/midi.cabal
+++ b/midi.cabal
@@ -1,5 +1,5 @@
 Name:             midi
-Version:          0.2.1.3
+Version:          0.2.1.4
 License:          GPL
 License-File:     LICENSE
 Author:           Henning Thielemann <haskell@henning-thielemann.de>
@@ -7,7 +7,7 @@
 Homepage:         http://www.haskell.org/haskellwiki/MIDI
 Category:         Sound, Music
 Tested-With:      GHC==6.4.1, GHC==6.8.2, GHC==6.10.4, GHC==6.12.3
-Tested-With:      GHC==7.0.4, GHC==7.2.1, GHC==7.4.1, GHC==7.6.1, GHC==7.8.2
+Tested-With:      GHC==7.0.4, GHC==7.2.2, GHC==7.4.2, GHC==7.6.3, GHC==7.8.4, GHC==7.10.1
 Cabal-Version:    >=1.14
 Build-Type:       Simple
 Synopsis:         Handling of MIDI messages and files
@@ -25,12 +25,12 @@
   src/Sound/MIDI/Example/Tomatosalad.hs
 Source-Repository head
   type:     darcs
-  location: http://code.haskell.org/~thielema/midi/
+  location: http://hub.darcs.net/thielema/midi/
 
 Source-Repository this
   type:     darcs
-  location: http://code.haskell.org/~thielema/midi/
-  tag:      0.2.1.3
+  location: http://hub.darcs.net/thielema/midi/
+  tag:      0.2.1.4
 
 Flag splitBase
   description: Choose the new smaller, split-up base package.
diff --git a/src/Sound/MIDI/Message.hs b/src/Sound/MIDI/Message.hs
--- a/src/Sound/MIDI/Message.hs
+++ b/src/Sound/MIDI/Message.hs
@@ -34,8 +34,6 @@
 data T =
      Channel Channel.T
    | System  System.T
--- Show instance requires Show instance of System.T
---     deriving (Show)
 
 
 get :: Parser.C parser => Parser.Fragile parser T
diff --git a/src/Sound/MIDI/Message/Channel.hs b/src/Sound/MIDI/Message/Channel.hs
--- a/src/Sound/MIDI/Message/Channel.hs
+++ b/src/Sound/MIDI/Message/Channel.hs
@@ -19,8 +19,7 @@
 import qualified Sound.MIDI.Parser.Status as StatusParser
 import           Sound.MIDI.Parser.Primitive
 import qualified Sound.MIDI.Parser.Class as Parser
-import Sound.MIDI.Parser.Status
-   (Channel, fromChannel,   toChannel, )
+import Sound.MIDI.Parser.Status (Channel, fromChannel, toChannel, )
 
 import Control.Monad (liftM, liftM2, when, )
 
@@ -41,7 +40,6 @@
      messageChannel :: Channel,
      messageBody    :: Body
    }
-     -- ToDo: make nicer Show instance
      deriving (Show, Eq, Ord)
 
 data Body =
@@ -127,5 +125,5 @@
 -- | output a channel + message code
 putChannel :: Writer.C writer => Channel -> Int -> StatusWriter.T writer
 putChannel chan code =
-   StatusWriter.change (Just (code, chan)) $
+   StatusWriter.change (code, chan) $
       Writer.putIntAsByte (16*code + fromChannel chan)
diff --git a/src/Sound/MIDI/Parser/Status.hs b/src/Sound/MIDI/Parser/Status.hs
--- a/src/Sound/MIDI/Parser/Status.hs
+++ b/src/Sound/MIDI/Parser/Status.hs
@@ -5,7 +5,7 @@
 -}
 module Sound.MIDI.Parser.Status
    (T, Status, set, get, run, lift,
-    Channel, fromChannel,   toChannel, ) where
+    Channel, fromChannel, toChannel, ) where
 
 import qualified Sound.MIDI.Parser.Class as Parser
 
diff --git a/src/Sound/MIDI/Writer/Basic.hs b/src/Sound/MIDI/Writer/Basic.hs
--- a/src/Sound/MIDI/Writer/Basic.hs
+++ b/src/Sound/MIDI/Writer/Basic.hs
@@ -43,8 +43,7 @@
 
 
 -- differences list
-newtype ByteList =
-   ByteList {unByteList :: Monoid.Endo MIO.ByteList}
+newtype ByteList = ByteList {unByteList :: Monoid.Endo MIO.ByteList}
 
 instance Monoid ByteList where
    mempty = ByteList mempty
diff --git a/src/Sound/MIDI/Writer/Status.hs b/src/Sound/MIDI/Writer/Status.hs
--- a/src/Sound/MIDI/Writer/Status.hs
+++ b/src/Sound/MIDI/Writer/Status.hs
@@ -23,7 +23,7 @@
 whether running status should be respected (True) or ignored (False).
 -}
 newtype T writer =
-   Cons {decons :: Reader.T Bool (State.T (Maybe Status) writer)}
+   Cons {decons :: Reader.T Bool (State.T Status writer)}
 
 
 instance Monoid writer => Monoid (T writer) where
@@ -35,7 +35,7 @@
 Given a writer that emits a status, generate a stateful writer,
 that decides whether to run the status emittor.
 -}
-change :: (Monoid writer) => Status -> writer -> T writer
+change :: (Monoid writer) => (Int,Channel) -> writer -> T writer
 change x emit =
    Cons $
    Reader.Cons $ \b ->