More edits for firs arXiv version