Verbose flag, NSAPI cleanup added
Correction