various tweaks to completion grabbing