Some more edits. Finish up later, then retime.