fixes based on Bill's comments