minor updates
merge brian's commit