diff --git a/07_final_assignment/baboonSimulation.R b/07_final_assignment/baboonSimulation.R
index c3f3fef..e6bfa45 100644
--- a/07_final_assignment/baboonSimulation.R
+++ b/07_final_assignment/baboonSimulation.R
@@ -49,7 +49,8 @@
                          StimulusType=factor(character(BLOCK_SIZE),
                                              c("LearnedWord","NewWord","Nonword")),
                          stringsAsFactors=F)
-    
+    stopifnot(is.character(data$Stimulus))
+
     result[1:25,] <- RandomPick(data[data$StimulusType == "NewWord",], 1)
     result[26:50,] <- RandomPick(data[data$StimulusType == "LearnedWord",], 25)
     result[51:100,] <- RandomPick(data[data$StimulusType == "Nonword",],50)
@@ -62,7 +63,7 @@
 BLOCK_SIZE <- 100
 test_that("CreateBlock", {
     stim <- as.character(1:300)
-    data <- data.frame(Stimulus=stim)
+    data <- data.frame(Stimulus=stim, stringsAsFactors=F)
     data$StimulusType[1:100] <- "NewWord"
     data$StimulusType[101:200] <- "LearnedWord"
     data$StimulusType[201:300] <- "Nonword"
@@ -77,7 +78,7 @@
     expect_that(length(unique(trialNewWords)), equals(1))
     expect_that(length(trialLearnedWords), equals(25))
     expect_that(length(trialNonwords), equals(50))
-    # What should be expected for empty vectors?
+    # TODO: Decide what should be expected for empty vectors?
 })
 
 PresentTrials <- function(trialCount, present, data){
@@ -119,7 +120,7 @@
 
 test_that("PresentTrials", {
     stim <- as.character(1:300)
-    data <- data.frame(Stimulus=stim)
+    data <- data.frame(Stimulus=stim, stringsAsFactors=F)
     data$StimulusType[1:100] <- "NewWord"
     data$StimulusType[101:200] <- "LearnedWord"
     data$StimulusType[201:300] <- "Nonword"
@@ -134,7 +135,6 @@
     stimuli <- result$Stimuli
     expect_equal(nrow(trials), count)
     expect_equal(length(stimuli$StimulusType[stimuli$StimulusType == "LearnedWord"]), 102)
-    # TODO: FAILES SOMETIMES!!!
 })
 
 MakeMonkey <- function(cueset, outcomeset=c("Word", "Nonword"),
@@ -162,6 +162,7 @@
             weights[cues[j],noType] <<-  weights[cues[j],noType] +
                 alpha * beta * (0 - totalActivation[noType])
         }
+        print(max(totalActivation))
         # TODO: RETURN GUESS!!!
     }