Some errors in the NFA have been resolved