edits after Jori's comments