More edits, not quite right yet.