Added files for improved Nfg code, carver version