more completion tweaks