More NFA changes.

Fixed some of the base case stuff.