adding discussion, other changes