addressing Ketan's comments, and a few other small changes