a hundred tiny edits to prepare this for the tutorial (also fixed the indenting, which makes it look like I replaced the whole thing)