minor additions, some comments