Index: bp-blogs/bp-blogs-functions.php
===================================================================
--- bp-blogs/bp-blogs-functions.php	(revision 4964)
+++ bp-blogs/bp-blogs-functions.php	(working copy)
@@ -49,14 +49,17 @@ function bp_blogs_record_existing_blogs() {
 	// Truncate user blogs table and re-record.
 	$wpdb->query( "TRUNCATE TABLE {$bp->blogs->table_name}" );
 
-	$blog_ids = $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM {$wpdb->base_prefix}blogs WHERE mature = 0 AND spam = 0 AND deleted = 0" ) );
+	if ( is_multisite() )
+		$blog_ids = $wpdb->get_col( $wpdb->prepare( "SELECT blog_id FROM {$wpdb->base_prefix}blogs WHERE mature = 0 AND spam = 0 AND deleted = 0" ) );
+	else
+		$blog_ids = 1;
 
 	if ( $blog_ids ) {
 		foreach( (array)$blog_ids as $blog_id ) {
 			$users 		= get_users( array( 'blog_id' => $blog_id ) );
 			$subscribers 	= get_users( array( 'blog_id' => $blog_id, 'role' => 'subscriber' ) );
 
-			if ( $users ) {
+			if ( !empty( $users ) ) {
 				foreach ( (array)$users as $user ) {
 					// Don't record blogs for subscribers
 					if ( !in_array( $user, $subscribers ) )
@@ -460,7 +463,7 @@ function bp_blogs_is_blog_hidden( $blog_id ) {
 function bp_blogs_delete_blogmeta( $blog_id, $meta_key = false, $meta_value = false ) {
 	global $wpdb, $bp;
 
-	if ( !is_numeric( $blog_id ) || !is_multisite() )
+	if ( !is_numeric( $blog_id ) )
 		return false;
 
 	$meta_key = preg_replace('|[^a-z0-9_]|i', '', $meta_key);
@@ -487,7 +490,7 @@ function bp_blogs_get_blogmeta( $blog_id, $meta_key = '') {
 
 	$blog_id = (int) $blog_id;
 
-	if ( !$blog_id || !is_multisite() )
+	if ( !$blog_id )
 		return false;
 
 	if ( !empty($meta_key) ) {
@@ -519,7 +522,7 @@ function bp_blogs_get_blogmeta( $blog_id, $meta_key = '') {
 function bp_blogs_update_blogmeta( $blog_id, $meta_key, $meta_value ) {
 	global $wpdb, $bp;
 
-	if ( !is_numeric( $blog_id ) || !is_multisite() )
+	if ( !is_numeric( $blog_id ) )
 		return false;
 
 	$meta_key = preg_replace( '|[^a-z0-9_]|i', '', $meta_key );
Index: bp-blogs/bp-blogs-loader.php
===================================================================
--- bp-blogs/bp-blogs-loader.php	(revision 4964)
+++ bp-blogs/bp-blogs-loader.php	(working copy)
@@ -53,7 +53,7 @@ class BP_Blogs_Component extends BP_Component {
 			'path'                  => BP_PLUGIN_DIR,
 			'slug'                  => BP_BLOGS_SLUG,
 			'root_slug'             => isset( $bp->pages->blogs->slug ) ? $bp->pages->blogs->slug : BP_BLOGS_SLUG,
-			'has_directory'         => true,
+			'has_directory'         => is_multisite(), // Non-multisite installs don't need a top-level Sites directory, since there's only one site
 			'notification_callback' => 'bp_blogs_format_notifications',
 			'search_string'         => __( 'Search sites...', 'buddypress' ),
 			'autocomplete_all'      => defined( 'BP_MESSAGES_AUTOCOMPLETE_ALL' ),
Index: bp-core/admin/bp-core-admin.php
===================================================================
--- bp-core/admin/bp-core-admin.php	(revision 4964)
+++ bp-core/admin/bp-core-admin.php	(working copy)
@@ -13,37 +13,6 @@ function bp_core_update_message() {
 add_action( 'in_plugin_update_message-buddypress/bp-loader.php', 'bp_core_update_message' );
 
 /**
- * Renders the main admin panel.
- *
- * @package BuddyPress Core
- * @since {@internal Unknown}}
- */
-function bp_core_admin_dashboard() {
-	$base_url = bp_get_admin_url( 'admin.php' );
-	$action   = add_query_arg( array( 'page' => 'bp-general-settings' ), $base_url );
-	?>
-
-	<div class="wrap" id="bp-admin">
-
-		<div id="bp-admin-header">
-			<h3><?php _e( 'BuddyPress', 'buddypress' ); ?></h3>
-			<h2><?php _e( 'Dashboard',  'buddypress' ); ?></h2>
-		</div>
-
-		<?php do_action( 'bp_admin_notices' ); ?>
-
-		<form action="<?php echo $action ?>" method="post" id="bp-admin-form">
-			<div id="bp-admin-content">
-				<p>[TODO: All sorts of awesome things will go here. Latest plugins and themes, stats, version check, support topics, news, tips]</p>
-			</div>
-		</form>
-
-	</div>
-
-<?php
-}
-
-/**
  * Renders the Settings admin panel.
  *
  * @package BuddyPress Core
@@ -347,7 +316,7 @@ function bp_core_admin_component_options() {
 			'title'       => __( 'Account Settings', 'buddypress' ),
 			'description' => __( 'Allow your users to modify their account and notification settings directly from within their profiles.', 'buddypress' )
 		),
-		'friends' => array(
+		'friends'  => array(
 			'title'       => __( 'Friend Connections', 'buddypress' ),
 			'description' => __( 'Let your users make connections so they can track the activity of others and focus on the people they care about the most.', 'buddypress' )
 		),
@@ -359,22 +328,19 @@ function bp_core_admin_component_options() {
 			'title'       => __( 'Activity Streams', 'buddypress' ),
 			'description' => __( 'Global, personal, and group activity streams with threaded commenting, direct posting, favoriting and @mentions, all with full RSS feed and email notification support.', 'buddypress' )
 		),
-		'groups' => array(
+		'groups'   => array(
 			'title'       => __( 'User Groups', 'buddypress' ),
 			'description' => __( 'Groups allow your users to organize themselves into specific public, private or hidden sections with separate activity streams and member listings.', 'buddypress' )
 		),
-		'forums' => array(
+		'forums'   => array(
 			'title'       => __( 'Discussion Forums', 'buddypress' ),
 			'description' => __( 'Full-powered discussion forums built directly into groups allow for more conventional in-depth conversations. NOTE: This will require an extra (but easy) setup step.', 'buddypress' )
-		)
-	) );
-
-	if ( is_multisite() ) {
-		$optional_components['blogs'] = array(
+		),
+		'blogs'    => array(
 			'title'       => __( 'Site Tracking', 'buddypress' ),
 			'description' => __( 'Track new sites, new posts and new comments across your entire network.', 'buddypress' )
-		);
-	}
+		)
+	) );
 
 	// Required components
 	$required_components = apply_filters( 'bp_admin_required_components', array(
Index: bp-core/admin/bp-core-update.php
===================================================================
--- bp-core/admin/bp-core-update.php	(revision 4964)
+++ bp-core/admin/bp-core-update.php	(working copy)
@@ -301,7 +301,7 @@ class BP_Core_Setup_Wizard {
 			<tr valign="top">
 				<th scope="row">
 					<h5><?php _e( 'Sites', 'buddypress' ); ?></h5>
-					<p><?php _e( 'Displays individual groups as well as a directory of groups.', 'buddypress' ); ?></p>
+					<p><?php _e( 'Displays a directory of the sites in your network.', 'buddypress' ); ?></p>
 				</th>
 				<td>
 					<p><input type="radio" name="bp_pages[blogs]" checked="checked" value="<?php echo $blogs_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ); ?> <?php echo site_url( $blogs_slug ); ?>/</p>
@@ -311,7 +311,7 @@ class BP_Core_Setup_Wizard {
 
 		</table>
 
-		<p><?php _e( 'Would you like to enable site tracking, which tracks activity across all of your network?', 'buddypress' ); ?></p>
+		<p><?php _e( 'Would you like to enable site tracking, which tracks blog posts and comments from across your network?', 'buddypress' ); ?></p>
 
 		<div class="left-col">
 
@@ -471,7 +471,7 @@ class BP_Core_Setup_Wizard {
 				<tr valign="top">
 					<th scope="row">
 						<h5><?php _e( 'Forums', 'buddypress' ); ?></h5>
-						<p><?php _e( 'Displays individual groups as well as a directory of groups.', 'buddypress' ); ?></p>
+						<p><?php _e( 'Displays a directory of public forum topics.', 'buddypress' ); ?></p>
 					</th>
 					<td>
 						<p><label><input type="radio" name="bp_pages[forums]" <?php checked( empty( $existing_pages['forums'] ) ); ?>  value="<?php echo $forums_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ); ?> <?php echo home_url( $forums_slug ); ?>/</label></p>
@@ -481,12 +481,13 @@ class BP_Core_Setup_Wizard {
 
 			<?php endif; ?>
 
+			<?php /* The Blogs component only needs a directory page when Multisite is enabled */ ?>
 			<?php if ( is_multisite() && isset( $active_components['blogs'] ) ) : ?>
 
 				<tr valign="top">
 					<th scope="row">
 						<h5><?php _e( 'Sites', 'buddypress' ); ?></h5>
-						<p><?php _e( 'Displays individual groups as well as a directory of groups.', 'buddypress' ); ?></p>
+						<p><?php _e( 'Displays a directory of the sites in your network.', 'buddypress' ); ?></p>
 					</th>
 					<td>
 						<p><label><input type="radio" name="bp_pages[blogs]" <?php checked( empty( $existing_pages['blogs'] ) ); ?>  value="<?php echo $blogs_slug; ?>" /> <?php _e( 'Automatically create a page at:', 'buddypress' ); ?> <?php echo home_url( $blogs_slug ); ?>/</label></p>
@@ -1022,6 +1023,7 @@ class BP_Core_Setup_Wizard {
 			// Load BP and hook the admin menu, so that the redirect is successful
 			if ( !function_exists( 'bp_core_update_message' ) )
 				require( WP_PLUGIN_DIR . '/buddypress/bp-core/admin/bp-core-admin.php' );
+
 			bp_core_add_admin_menu();
 
 			// Redirect to the BuddyPress dashboard
@@ -1109,8 +1111,8 @@ function bp_core_install( $active_components = false ) {
 	if ( !empty( $active_components['xprofile'] ) )
 		bp_core_install_extended_profiles();
 
-	// Only install blog tables if this is a multisite installation
-	if ( is_multisite() && !empty( $active_components['blogs'] ) )
+	// Blog tracking
+	if ( !empty( $active_components['blogs'] ) )
 		bp_core_install_blog_tracking();
 }
 
@@ -1136,7 +1138,7 @@ function bp_update_db_stuff() {
 	}
 
 	// On first installation - record all existing blogs in the system.
-	if ( !(int)$bp->site_options['bp-blogs-first-install'] && is_multisite() ) {
+	if ( !(int)$bp->site_options['bp-blogs-first-install'] ) {
 		bp_blogs_record_existing_blogs();
 		bp_update_option( 'bp-blogs-first-install', 1 );
 	}
Index: bp-core/bp-core-functions.php
===================================================================
--- bp-core/bp-core-functions.php	(revision 4964)
+++ bp-core/bp-core-functions.php	(working copy)
@@ -352,7 +352,7 @@ function bp_core_activation_notice() {
 	 * wizard because of the order which the components are loaded. We check for multisite here
 	 * on the off chance that someone has activated the blogs component and then disabled MS
 	 */
-	if ( is_multisite() && bp_is_active( 'blogs' ) ) {
+	if ( bp_is_active( 'blogs' ) ) {
 		$count = $wpdb->get_var( $wpdb->prepare( "SELECT COUNT(*) FROM {$bp->blogs->table_name}" ) );
 
 		if ( !$count )
Index: bp-core/bp-core-loader.php
===================================================================
--- bp-core/bp-core-loader.php	(revision 4964)
+++ bp-core/bp-core-loader.php	(working copy)
@@ -57,16 +57,10 @@ class BP_Core extends BP_Component {
 		/** Components ********************************************************/
 
 		// Set the included and optional components.
-		$bp->optional_components = array( 'activity', 'forums', 'friends', 'groups', 'messages', 'settings', 'xprofile' );
-
-		// Blogs component only available for multisite
-		if ( is_multisite() )
-			$bp->optional_components[] = 'blogs';
-
-		$bp->optional_components    = apply_filters( 'bp_optional_components', $bp->optional_components );
+		$bp->optional_components = apply_filters( 'bp_optional_components', array( 'activity', 'blogs', 'forums', 'friends', 'groups', 'messages', 'settings', 'xprofile' ) );
 
 		// Set the required components
-		$bp->required_components    = apply_filters( 'bp_required_components', array( 'members' ) );
+		$bp->required_components = apply_filters( 'bp_required_components', array( 'members' ) );
 
 		// Get a list of activated components
 		if ( $active_components = bp_get_option( 'bp-active-components' ) ) {