Further nfe, bugfixes and cleanup