yb modified discussion and fixed some refs