Some more edits
This will be tested on the next demonstration run.