Fixing issues after conflict

Of course I went in to change that loop and several other items. It's
still not quite ready, as I'm not sure how the monster identifies
"nodes", but it's getting there.