Misc Fix
NFA - First Draft