Verbose flag, NSAPI cleanup added