4 files changed, 21 insertions, 23 deletions

diff --git a/src/Network/BitTorrent.hs b/src/Network/BitTorrent.hs
index 97efbbda..5ed786d0 100644
--- a/src/Network/BitTorrent.hs
+++ b/src/Network/BitTorrent.hs
@@ -1,11 +1,13 @@
-module Network.BitTorrent
-       ( module Network.BitTorrent.Peer
-       , module Network.BitTorrent.PeerID
-       , module Network.BitTorrent.Tracker
-       , module Network.BitTorrent.PeerWire
-       ) where
+-- |
+--   Copyright   :  (c) Sam T. 2013
+--   License     :  MIT
+--   Maintainer  :  pxqr.sta@gmail.com
+--   Stability   :  experimental
+--   Portability :  portable
+--
+module Network.BitTorrent (module BT) where
 
-import Network.BitTorrent.Peer
-import Network.BitTorrent.PeerID
-import Network.BitTorrent.Tracker
-import Network.BitTorrent.PeerWire
+import Network.BitTorrent.Peer as BT
+import Network.BitTorrent.PeerID as BT
+import Network.BitTorrent.Tracker as BT
+import Network.BitTorrent.PeerWire as BT
diff --git a/src/Network/BitTorrent/PeerWire.hs b/src/Network/BitTorrent/PeerWire.hs
index b53cd22c..fde98695 100644
--- a/src/Network/BitTorrent/PeerWire.hs
+++ b/src/Network/BitTorrent/PeerWire.hs
@@ -6,14 +6,9 @@
 --   Portability :  portable
 --
 {-# LANGUAGE DoAndIfThenElse #-}
-module Network.BitTorrent.PeerWire
-       ( module Network.BitTorrent.PeerWire.Block
-       , module Network.BitTorrent.PeerWire.Message
-       , module Network.BitTorrent.PeerWire.Handshake
-       , module Network.BitTorrent.PeerWire.ClientInfo
-       ) where
+module Network.BitTorrent.PeerWire (module PW) where
 
-import Network.BitTorrent.PeerWire.Block
-import Network.BitTorrent.PeerWire.Message
-import Network.BitTorrent.PeerWire.Handshake
-import Network.BitTorrent.PeerWire.ClientInfo
+import Network.BitTorrent.PeerWire.Block as PW
+import Network.BitTorrent.PeerWire.Message as PW
+import Network.BitTorrent.PeerWire.Handshake as PW
+import Network.BitTorrent.PeerWire.ClientInfo as PW
diff --git a/src/Network/BitTorrent/PeerWire/ClientInfo.hs b/src/Network/BitTorrent/PeerWire/ClientInfo.hs
index f1055343..3b60f75c 100644
--- a/src/Network/BitTorrent/PeerWire/ClientInfo.hs
+++ b/src/Network/BitTorrent/PeerWire/ClientInfo.hs
@@ -52,7 +52,7 @@ data ClientImpl =
  | IFoxTorrent
  | IGSTorrent
  | IHalite
- | IlibHSnetwork_bittorrent
+ | IlibHSbittorrent
  | IHydranode
  | IKGet
  | IKTorrent
@@ -116,7 +116,7 @@ parseImpl = f . BC.unpack
   f "FT" = IFoxTorrent
   f "GS" = IGSTorrent
   f "HL" = IHalite
-  f "HS" = IlibHSnetwork_bittorrent
+  f "HS" = IlibHSbittorrent
   f "HN" = IHydranode
   f "KG" = IKGet
   f "KT" = IKTorrent
diff --git a/src/Network/BitTorrent/Tracker/Protocol.hs b/src/Network/BitTorrent/Tracker/Protocol.hs
index 000b38c1..616e760b 100644
--- a/src/Network/BitTorrent/Tracker/Protocol.hs
+++ b/src/Network/BitTorrent/Tracker/Protocol.hs
@@ -34,6 +34,7 @@ module Network.BitTorrent.Tracker.Protocol
        where
 
 import Control.Applicative
+import Control.Monad
 import Data.Char as Char
 import Data.Word (Word32)
 import Data.List as L
@@ -130,7 +131,7 @@ instance BEncodable TResponse where
         getPeers (Just (BString s))
             | B.length s `mod` 6 == 0 =
               let cnt = B.length s `div` 6 in
-              runGet (sequence (L.replicate cnt peerG)) s
+              runGet (replicateM cnt peerG) s
             | otherwise = decodingError "peers length not a multiple of 6"
           where
             peerG = do