Possible fixes, added threaded nfo lookup