Updates from John

you'll want to merge in these changes (I think!)