Added bundles, ctrl-p tweaks