small edits before meeting
merging issues