merge in recent pull reqs