merging in some of Clay's additional edits