Some edits following Jonathans' pull request