@@ -75,7 +75,7 @@ dbwebb validate lab3
 
 # marvin2
 test -d me/kmom03/marvin2
-cd me && cp -ri kmom02/marvin1/marvin.py kmom03/marvin2/main.py && cd kmom03/marvin2
+cd me && cp -ri kmom02/marvin1/marvin.py kmom03/marvin2/ && cd kmom03/marvin2
 dbwebb validate marvin2
 
 
@@ -92,7 +92,7 @@ dbwebb validate lab4
 
 # marvin3
 test -d me/kmom04/marvin3
-cd me && cp -ri kmom03/marvin2/main.py kmom04/marvin3/ && cd kmom04/marvin3
+cd me && cp -ri kmom03/marvin2/marvin.py kmom04/marvin3/main.py && cd kmom04/marvin3
 cd me && cp -i ../example/marvin/quotes_lgtg.txt kmom04/marvin3/quotes.txt
 dbwebb validate marvin3
 
@@ -145,6 +145,7 @@ test -d me/kmom06/warehouse
 # analyzer
 test -d me/kmom06/analyzer
 cd me && cp -i ../example/text/phil.txt kmom06/analyzer/ && cd kmom06/analyzer/
+touch me/kmom06/analyzer/main.py
 dbwebb validate analyzer
 
 # --------------------------------------------------------------------------
 
@@ -63,7 +63,7 @@ pythonkmom03()
     inspectLab "uppgift/python-med-funktioner" "lab3" "answer.py" "python3 answer.py"
 
     inspectExerciseHeader "marvin2" "uppgift/din-egen-chattbot-marvin-steg-2" "$KMOM/marvin2"
-    inspectCommand "main.py" "$EXEC_DIR/$KMOM/marvin2" "python3 main.py"
+    inspectCommand "marvin.py" "$EXEC_DIR/$KMOM/marvin2" "python3 marvin.py"
 }
 
 
@@ -75,7 +75,7 @@ pythonkmom04()
 {
     inspectLab "uppgift/python-listor" "lab4" "answer.py" "python3 answer.py"
 
-    inspectExerciseHeader "marvin3" "uppgift/din-egen-chattbot-marvin-steg-3\n-- ${DBW_WWW}uppgift/din-egen-chattbot-marvin-inventarie" "$KMOM/marvin3"
+    inspectExerciseHeader "marvin3" "uppgift/din-egen-chattbot-marvin-steg-3" "$KMOM/marvin3"
     inspectCommand "main.py" "$EXEC_DIR/$KMOM/marvin3" "python3 main.py"
 }
 
@@ -87,11 +87,8 @@ pythonkmom05()
 {
     inspectLab "uppgift/python-med-dictionaries-och-tupler" "lab5" "answer.py" "python3 answer.py"
 
-    inspectExerciseHeader "analyzer" "uppgift/analysera-text-och-ord" "$KMOM/analyzer"
-    inspectCommand "main.py" "$EXEC_DIR/$KMOM/analyzer" "python3 main.py lines phil.txt"
-    inspectCommand "main.py" "$EXEC_DIR/$KMOM/analyzer" "python3 main.py all phil.txt"
-
-    pythonexercise "marvin4" "main.py" "uppgift/din-egen-chattbot-marvin-tictactoe\n-- ${DBW_WWW}uppgift/din-egen-chattbot-marvin-steg-4"
+    inspectExerciseHeader "marvin4" "uppgift/din-egen-chattbot-marvin-inventarie\n-- ${DBW_WWW}uppgift/din-egen-chattbot-marvin-tictactoe-v2\n-- ${DBW_WWW}uppgift/din-egen-chattbot-marvin-krypt" "$KMOM/marvin4"
+    inspectCommand "main.py" "$EXEC_DIR/$KMOM/marvin4" "python3 main.py"
 }
 
 
@@ -101,10 +98,12 @@ pythonkmom05()
 #
 pythonkmom06()
 {
-    inspectExerciseHeader "analyzer2" "uppgift/din-egen-chattbot-marvin-steg-5" "$KMOM/analyzer2"
-    # inspectCommand "main.py" "$EXEC_DIR/$KMOM/analyzer2" "python3 main.py"
-    
-    pythonmarvin5 "analyzer2" "main.py" "uppgift/din-egen-chattbot-marvin-steg-5"
+    inspectLab "uppgift/python-med-dictionaries-och-tupler" "lab6" "answer.py" "python3 answer.py"
+
+
+    inspectExerciseHeader "analyzer" "uppgift/analysera-text-och-ord-v2" "$KMOM/analyzer"
+    inspectCommand "main.py" "$EXEC_DIR/$KMOM/analyzer" "python3 main.py lines phil.txt"
+    inspectCommand "main.py" "$EXEC_DIR/$KMOM/analyzer" "python3 main.py all phil.txt"
 }
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ pythonkmom03()`
`63`	`63`	`inspectLab "uppgift/python-med-funktioner" "lab3" "answer.py" "python3 answer.py"`
`64`	`64`
`65`	`65`	`inspectExerciseHeader "marvin2" "uppgift/din-egen-chattbot-marvin-steg-2" "$KMOM/marvin2"`
`66`		`- inspectCommand "main.py" "$EXEC_DIR/$KMOM/marvin2" "python3 main.py"`
	`66`	`+ inspectCommand "marvin.py" "$EXEC_DIR/$KMOM/marvin2" "python3 marvin.py"`
`67`	`67`	`}`
`68`	`68`
`69`	`69`
`@@ -75,7 +75,7 @@ pythonkmom04()`
`75`	`75`	`{`
`76`	`76`	`inspectLab "uppgift/python-listor" "lab4" "answer.py" "python3 answer.py"`
`77`	`77`
`78`		`- inspectExerciseHeader "marvin3" "uppgift/din-egen-chattbot-marvin-steg-3\n-- ${DBW_WWW}uppgift/din-egen-chattbot-marvin-inventarie" "$KMOM/marvin3"`
	`78`	`+ inspectExerciseHeader "marvin3" "uppgift/din-egen-chattbot-marvin-steg-3" "$KMOM/marvin3"`
`79`	`79`	`inspectCommand "main.py" "$EXEC_DIR/$KMOM/marvin3" "python3 main.py"`
`80`	`80`	`}`
`81`	`81`
`@@ -87,11 +87,8 @@ pythonkmom05()`
`87`	`87`	`{`
`88`	`88`	`inspectLab "uppgift/python-med-dictionaries-och-tupler" "lab5" "answer.py" "python3 answer.py"`
`89`	`89`
`90`		`- inspectExerciseHeader "analyzer" "uppgift/analysera-text-och-ord" "$KMOM/analyzer"`
`91`		`- inspectCommand "main.py" "$EXEC_DIR/$KMOM/analyzer" "python3 main.py lines phil.txt"`
`92`		`- inspectCommand "main.py" "$EXEC_DIR/$KMOM/analyzer" "python3 main.py all phil.txt"`
`93`		`-`
`94`		`- pythonexercise "marvin4" "main.py" "uppgift/din-egen-chattbot-marvin-tictactoe\n-- ${DBW_WWW}uppgift/din-egen-chattbot-marvin-steg-4"`
	`90`	`+ inspectExerciseHeader "marvin4" "uppgift/din-egen-chattbot-marvin-inventarie\n-- ${DBW_WWW}uppgift/din-egen-chattbot-marvin-tictactoe-v2\n-- ${DBW_WWW}uppgift/din-egen-chattbot-marvin-krypt" "$KMOM/marvin4"`
	`91`	`+ inspectCommand "main.py" "$EXEC_DIR/$KMOM/marvin4" "python3 main.py"`
`95`	`92`	`}`
`96`	`93`
`97`	`94`
`@@ -101,10 +98,12 @@ pythonkmom05()`
`101`	`98`	`#`
`102`	`99`	`pythonkmom06()`
`103`	`100`	`{`
`104`		`- inspectExerciseHeader "analyzer2" "uppgift/din-egen-chattbot-marvin-steg-5" "$KMOM/analyzer2"`
`105`		`- # inspectCommand "main.py" "$EXEC_DIR/$KMOM/analyzer2" "python3 main.py"`
`106`		`-`
`107`		`- pythonmarvin5 "analyzer2" "main.py" "uppgift/din-egen-chattbot-marvin-steg-5"`
	`101`	`+ inspectLab "uppgift/python-med-dictionaries-och-tupler" "lab6" "answer.py" "python3 answer.py"`
	`102`	`+`
	`103`	`+`
	`104`	`+ inspectExerciseHeader "analyzer" "uppgift/analysera-text-och-ord-v2" "$KMOM/analyzer"`
	`105`	`+ inspectCommand "main.py" "$EXEC_DIR/$KMOM/analyzer" "python3 main.py lines phil.txt"`
	`106`	`+ inspectCommand "main.py" "$EXEC_DIR/$KMOM/analyzer" "python3 main.py all phil.txt"`
`108`	`107`	`}`
`109`	`108`
`110`	`109`