pull in a few more commits