diff --git a/auth.go b/auth.go
index 125cda4..6f8bb4c 100644
--- a/auth.go
+++ b/auth.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"os"
 	"strings"
-	"irc"
+	irc "github.com/fluffle/goirc/client"
 	"github.com/kless/goconfig/config"
 )
 
diff --git a/cmd-access.go b/cmd-access.go
index 5c542fd..fdb8b5e 100644
--- a/cmd-access.go
+++ b/cmd-access.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"irc"
+	irc "github.com/fluffle/goirc/client"
 	"strings"
 )
 
diff --git a/cmd-admin.go b/cmd-admin.go
index 9e1c882..8dd79ee 100644
--- a/cmd-admin.go
+++ b/cmd-admin.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"irc"
+	irc "github.com/fluffle/goirc/client"
 )
 
 func nick(conn *irc.Conn, nick *irc.Nick, args, target string) {
diff --git a/cmd-google.go b/cmd-google.go
index e56b616..60f1e2e 100644
--- a/cmd-google.go
+++ b/cmd-google.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"irc"
+	irc "github.com/fluffle/goirc/client"
 	"fmt"
 	"strings"
 	"os"
diff --git a/cmd-op.go b/cmd-op.go
index 7848352..5bedcfc 100644
--- a/cmd-op.go
+++ b/cmd-op.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"irc"
+	irc "github.com/fluffle/goirc/client"
 	"strings"
 )
 
diff --git a/handler.go b/handler.go
index 5445a14..0112a0a 100644
--- a/handler.go
+++ b/handler.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"irc"
+	irc "github.com/fluffle/goirc/client"
 	"fmt"
 	"strings"
 	"http"
@@ -56,23 +56,23 @@ func handlePrivmsg(conn *irc.Conn, line *irc.Line) {
 	target := line.Args[0]
 	if isChannel(target) {
 		// message to a channel
-		if start := strings.Index(line.Text, "youtube.com/watch?v="); start > -1 {
-			video := line.Text[start+20:]
+		if start := strings.Index(line.Args[1], "youtube.com/watch?v="); start > -1 {
+			video := line.Args[1][start+20:]
 			if end := strings.IndexAny(video, " &#"); end > -1 {
 				video = video[0:end]
 			}
 			youtube(conn, nick, video, target)
 		} else {
-			command(conn, nick, line.Text, target)
+			command(conn, nick, line.Args[1], target)
 		}
 	} else if target == conn.Me.Nick {
 		// message to us
-		command(conn, nick, line.Text, line.Nick)
+		command(conn, nick, line.Args[1], line.Nick)
 	}
 }
 
 func handleMode(conn *irc.Conn, line *irc.Line) {
-	if line.Args[0] == conn.Me.Nick && line.Text == "+r" {
+	if line.Args[0] == conn.Me.Nick && line.Args[1] == "+r" {
 		autojoin(conn)
 	}
 }
@@ -83,7 +83,7 @@ func handleJoin(conn *irc.Conn, line *irc.Line) {
 		return
 	}
 
-	channel := conn.GetChannel(line.Text)
+	channel := conn.GetChannel(line.Args[1])
 	if channel == nil || !channel.Modes.Moderated {
 		return
 	}
@@ -96,8 +96,8 @@ func handleJoin(conn *irc.Conn, line *irc.Line) {
 	if nick == nil {
 		return
 	}
-	if hasAccess(conn, nick, line.Text, "v") {
-		conn.Mode(line.Text, "+v " + line.Nick)
+	if hasAccess(conn, nick, line.Args[1], "v") {
+		conn.Mode(line.Args[1], "+v " + line.Nick)
 	}
 }
 
@@ -113,7 +113,7 @@ func handleInvite(conn *irc.Conn, line *irc.Line) {
 
 	owner, _ := auth.String(conn.Network, "owner")
 	if user == owner {
-		conn.Join(line.Text)
+		conn.Join(line.Args[1])
 	}
 }
 
diff --git a/rbot.go b/rbot.go
index ac82735..d3bad02 100644
--- a/rbot.go
+++ b/rbot.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"irc"
+	irc "github.com/fluffle/goirc/client"
 	"fmt"
 	"os"
 	"strings"