diff --git a/Dockerfile b/Dockerfile
index 9bfc9d0..ae10e78 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,4 +17,4 @@ ENV PATH $PATH:/flokatirc
 
 WORKDIR /flokatirc
 
-CMD [ "/flokatirc/flokatirc", "-server=irc.dnix.de:6667", "-name=Flokati", "-chan=#northbrigade", "-nsname=N", "-nspass=t0ps3cr37" ]
+CMD [ "/flokatirc/flokatirc", "-server=irc.dnix.de:6667", "-name=Flokati", "-chan=#test", "-nsname=N", "-nspass=t0ps3cr37" ]
diff --git a/main.go b/main.go
index d79cf0e..764bc86 100644
--- a/main.go
+++ b/main.go
@@ -1,8 +1,8 @@
-// vim:ts=4:sts=4:sw=4:noet:tw=72
+// vi:ts=4:sts=4:sw=4:noet:tw=72
 //
 // flokatirc
 //
-// Copyright (c) 2015 Andreas Neue <an@dnix.de>
+// Copyright (c) 2015,2016 Andreas Neue <an@dnix.de>
 
 package main
 
diff --git a/modules/sc/sc.go b/modules/sc/sc.go
index dc5d14b..d4a9b79 100644
--- a/modules/sc/sc.go
+++ b/modules/sc/sc.go
@@ -61,11 +61,11 @@ func HandleMessage(m *irc.Message) {
 	switch tok[0] {
 	case "!scstats":
 		showScStats()
-	case "!cit":
+	case "!sccit":
 		if len(tok) > 1 {
 			showCitizen(tok[1])
 		}
-	case "!org":
+	case "!scorg":
 		if len(tok) > 1 {
 			showOrganization(tok[1])
 		}
diff --git a/util/util.go b/util/util.go
index fac6122..479de12 100644
--- a/util/util.go
+++ b/util/util.go
@@ -1,4 +1,4 @@
-// vim:ts=4:sts=4:sw=4:noet:tw=72
+// vi:ts=4:sts=4:sw=4:noet:tw=72
 
 package util