initial intro edits merge into master