Fix formatting and typos
Add missing discussion of sets
Clean up section on if statements and conditionals