Edits following Josef's review