Added a few bundles, cleaned up the handling of spaces.