merging rauljim's NFC/Tribler work
correcting manual corrections