Tweaks for included functions (Ctrl-R)
Major improvements in function matching