Yaba.NBP - some comments added