diff --git a/src/data.go b/src/data.go
index 5568a6a..62b6b47 100644
--- a/src/data.go
+++ b/src/data.go
@@ -509,6 +509,7 @@ func saveXEpgMapping(request RequestStruct) (err error) {
 
 		go func() {
 
+			mapping()
 			createXMLTVFile()
 			createM3UFile()
 			showInfo("XEPG:" + fmt.Sprintf("Ready to use"))
@@ -541,7 +542,7 @@ func saveXEpgMapping(request RequestStruct) (err error) {
 
 			cleanupXEPG()
 			//buildXEPG(false)
-
+			mapping()
 			createXMLTVFile()
 			createM3UFile()
 			showInfo("XEPG:" + fmt.Sprintf("Ready to use"))
diff --git a/src/webserver.go b/src/webserver.go
index bfc5558..4f72266 100644
--- a/src/webserver.go
+++ b/src/webserver.go
@@ -132,7 +132,7 @@ func Stream(w http.ResponseWriter, r *http.Request) {
 	switch Settings.Buffer {
 
 	case "-":
-		showInfo(fmt.Sprintf("Buffer:false", Settings.Buffer))
+		showInfo(fmt.Sprintf("Buffer:false [%s]", Settings.Buffer))
 
 	case "xteve":
 		if strings.Index(streamInfo.URL, "rtsp://") != -1 || strings.Index(streamInfo.URL, "rtp://") != -1 {