tweaks to completion and tabs