update some nits based on arthur's comments