diff --git a/Kevin/Damn/Protocol.hs b/Kevin/Damn/Protocol.hs
--- a/Kevin/Damn/Protocol.hs
+++ b/Kevin/Damn/Protocol.hs
@@ -44,7 +44,7 @@
 respond pkt "login" = if okay pkt
     then do
         modify_ $ loggedIn ^= True
-        gets_ (^. toJoin) >>= mapM_ sendJoin
+        gets_ (^. joining) >>= mapM_ sendJoin
     else I.sendNotice $ "Login failed: " `T.append` getArg "e" pkt
 
 respond pkt "join" = do
diff --git a/Kevin/Protocol.hs b/Kevin/Protocol.hs
--- a/Kevin/Protocol.hs
+++ b/Kevin/Protocol.hs
@@ -34,7 +34,6 @@
                           mempty
                           mempty
                           mempty
-                          mempty
                           False
                           logChan
 
diff --git a/Kevin/Types.hs b/Kevin/Types.hs
--- a/Kevin/Types.hs
+++ b/Kevin/Types.hs
@@ -14,7 +14,7 @@
     modify_,
     
     -- lenses
-    users, privclasses, titles, toJoin, joining, loggedIn,
+    users, privclasses, titles, joining, loggedIn,
     
     -- other accessors
     damn, irc, dChan, iChan, settings, logger
@@ -58,7 +58,6 @@
                    , _users :: UserStore
                    , _privclasses :: PrivclassStore
                    , _titles :: TitleStore
-                   , _toJoin :: [T.Text]
                    , _joining :: [T.Text]
                    , _loggedIn :: Bool
                    , logger :: Chan String
diff --git a/kevin.cabal b/kevin.cabal
--- a/kevin.cabal
+++ b/kevin.cabal
@@ -1,5 +1,5 @@
 Name:             kevin
-Version:          0.1.5.3
+Version:          0.1.5.4
 Synopsis:         a dAmn ↔ IRC proxy
 Description:      a dAmn ↔ IRC proxy
 License:          GPL
@@ -12,7 +12,7 @@
 
 source-repository head
     type: git
-    location: git://github.com/otter/kevin.git
+    location: git://github.com/otters/kevin.git
 
 Executable kevin
     Main-is:          Main.hs
@@ -20,4 +20,4 @@
     Other-Modules:    Kevin, Kevin.Protocol, Kevin.Base, Kevin.Util.Logger, Kevin.IRC.Protocol, Kevin.Damn.Protocol, Kevin.Util.Entity, Kevin.Util.Tablump, Kevin.Damn.Packet, Kevin.Damn.Protocol.Send, Kevin.IRC.Protocol.Send, Kevin.IRC.Packet, Kevin.Settings, Kevin.Types, Kevin.Util.Token
     extensions:       CPP, DeriveDataTypeable, ExistentialQuantification, OverloadedStrings, ScopedTypeVariables, TemplateHaskell
     ghc-options:      -Wall -fno-warn-unused-do-bind -threaded
-    cpp-options:      -DVERSION="0.1.5.3"
+    cpp-options:      -DVERSION="0.1.5.4"