made some, not all, changes based on most recent YX and JC comments