diff --git a/main.go b/main.go
index 34dd9fb..da5a6a1 100644
--- a/main.go
+++ b/main.go
@@ -87,7 +87,7 @@ func run(c *cli.Context) error {
 	if c.String("owner") != "" {
 		b.Meta["owner"] = c.String("owner")
 	}
-	if c.String("kbstore-team") != "" {
+	if c.String("kvstore-team") != "" {
 		b.Meta["kvstore"] = c.String("kvstore-team")
 		loadNsfwAllowed(b)
 	}
@@ -100,8 +100,9 @@ func run(c *cli.Context) error {
 	// register the bot commands
 	b.Commands = append(b.Commands,
 		keybasebot.BotCommand{
-			Name: "ping",
-			Ad:   &cmd.PingAd,
+			Name:   "ping",
+			Ad:     &cmd.PingAd,
+			AdType: "public",
 			Run: keybasebot.Adapt(
 				cmd.SendPong,
 				keybasebot.MessageType("text"),
@@ -109,8 +110,9 @@ func run(c *cli.Context) error {
 			),
 		},
 		keybasebot.BotCommand{
-			Name: "age",
-			Ad:   &cmd.AgeAd,
+			Name:   "age",
+			Ad:     &cmd.AgeAd,
+			AdType: "public",
 			Run: keybasebot.Adapt(
 				cmd.Age,
 				keybasebot.MessageType("text"),
@@ -118,8 +120,9 @@ func run(c *cli.Context) error {
 			),
 		},
 		keybasebot.BotCommand{
-			Name: "convert",
-			Ad:   &cmd.ConvertAd,
+			Name:   "convert",
+			Ad:     &cmd.ConvertAd,
+			AdType: "public",
 			Run: keybasebot.Adapt(
 				cmd.Convert,
 				keybasebot.MessageType("text"),
@@ -127,8 +130,9 @@ func run(c *cli.Context) error {
 			),
 		},
 		keybasebot.BotCommand{
-			Name: "price",
-			Ad:   &cmd.PriceAd,
+			Name:   "price",
+			Ad:     &cmd.PriceAd,
+			AdType: "public",
 			Run: keybasebot.Adapt(
 				cmd.SendPrice,
 				keybasebot.MessageType("text"),
@@ -136,10 +140,12 @@ func run(c *cli.Context) error {
 			),
 		},
 		keybasebot.BotCommand{
-			Name: "nsfw",
-			Ad:   nil,
+			Name:       "nsfw",
+			Ad:         &cmd.NsfwAd,
+			AdType:     "teammembers",
+			AdTeamName: c.String("kvstore-team"),
 			Run: keybasebot.Adapt(
-				setNsfw,
+				cmd.SetNsfw,
 				keybasebot.MessageType("text"),
 				keybasebot.CommandPrefix("!nsfw"),
 				keybasebot.FromUser(c.String("owner")),