more vimmery, trimmed down bundles