WIP: addressing jeffs questions + a couple other minor edits