nfc and other i hope fixes