Minor edits - possibly last before deadline