diff --git a/cmd/mxl-pattern/main.go b/cmd/mxl-pattern/main.go
index d48da7d..b45ea05 100644
--- a/cmd/mxl-pattern/main.go
+++ b/cmd/mxl-pattern/main.go
@@ -298,12 +298,12 @@ func flagSetAddFlags(fs *pflag.FlagSet, args *appArgs) {
 			"br - bottom-right corner",
 	)
 
-	fs.UintVar(&args.videoWidth, "width", 1920, "Video pattern width. Zero = no video [TODO]")
+	fs.UintVar(&args.videoWidth, "width", 1920, "Video pattern width. Zero = no video [TODO: 0 width case]")
 	fs.UintVar(&args.videoHeight, "height", 1080, "Video pattern height")
 	fs.StringVar(&args.videoFPS, "fps", "25", "Video pattern FPS")
 	fs.StringVar(&args.videoUUID, "video-id", "", "Video UUID. Will be created, if not provided")
 	// Audio pattern flags
-	fs.Uint8VarP(&args.audioChannels, "channel", "c", 0, "Amount of audio channels. Each channel: num * 1kHz. Zero = no sound")
+	fs.Uint8VarP(&args.audioChannels, "channel", "c", 0, "Amount of audio channels. Each channel: num * 1kHz. Zero = no sound [TODO]")
 	fs.StringVarP(&args.audioSamplingFreq, "freq", "f", "48", "Sampling frequency of test audio feed in kHz [TODO]")
 	fs.StringVar(&args.audioUUID, "audio-id", "", "Audio UUID. Will be created, if not provided [TODO]")
 }
@@ -330,7 +330,6 @@ func main() {
 	}
 	checkArgs(args)
 
-	var mxlDomain string = "/dev/shm/mxl"
 	type videoInfo struct {
 		uuid   string
 		width  uint
@@ -368,7 +367,7 @@ func main() {
 	}
 
 	log.Printf("%s %s", APP_NAME, APP_VER)
-	log.Printf("Domain: %s", mxlDomain)
+	log.Printf("Domain: %s", args.domain)
 	log.Printf("Video: %dx%d %d/%d", vi.width, vi.height, vi.fps.Num, vi.fps.Den)
 	log.Printf("Video UUID: %s", vi.uuid)
 
@@ -409,7 +408,7 @@ func main() {
 		}
 	}
 
-	inst, err := mxl.NewInstance(mxlDomain, "")
+	inst, err := mxl.NewInstance(args.domain, "")
 	if err != nil {
 		log.Fatalf("MXL Init Failed: %v", err)
 	}
@@ -420,7 +419,7 @@ func main() {
 		log.Fatalf("Failed to create MXL writer: %v", err)
 	}
 	if !isCreated {
-		log.Printf("reusing existing flow: %s, domain: %s", vi.uuid, mxlDomain)
+		log.Printf("reusing existing flow: %s, domain: %s", vi.uuid, args.domain)
 	}
 	defer writer.Close()