changes from bcp
update with some of bcp's comments