Several edits - many previous things remain in comments to pull from