Minor fixes, more testing, another todo

Time to use the Free Monad from scalaz to avoid my stack overflows: or, at
least, it's worth a try. Also, figure out the bug with "John kissed." That is a
problem.