Fixed NFA transition dissapearance.
Initial merge.
Added Rochelles change back in.
Pulled in Rochelles changes.