Checking in a few improvements.