diff --git a/profiles/planetmath/modules/features/planetmath_menus/planetmath_menus.features.menu_links.inc b/profiles/planetmath/modules/features/planetmath_menus/planetmath_menus.features.menu_links.inc
index 962b37f3..a9d0926a 100644
--- a/profiles/planetmath/modules/features/planetmath_menus/planetmath_menus.features.menu_links.inc
+++ b/profiles/planetmath/modules/features/planetmath_menus/planetmath_menus.features.menu_links.inc
@@ -36,7 +36,7 @@ function planetmath_menus_menu_default_menu_links() {
     'link_title' => 'Articles',
     'options' => array(
       'attributes' => array(
-        'title' => '',
+        'title' => 'PlanetMath is known for its high-quality mathematics Encyclopedia.',
       ),
     ),
     'module' => 'menu',
@@ -126,7 +126,7 @@ function planetmath_menus_menu_default_menu_links() {
     'link_title' => 'People',
     'options' => array(
       'attributes' => array(
-        'title' => 'Math for the people, by the people.',
+        'title' => 'These are the people who do math for the people.',
       ),
     ),
     'module' => 'menu',
@@ -172,6 +172,210 @@ function planetmath_menus_menu_default_menu_links() {
     'expanded' => '0',
     'weight' => '0',
   );
+
+  // We don't need this menu I don't think.
+
+  /* // Exported menu link: menu-main-menu:<front> */
+  /* $menu_links['menu-main-menu:<front>'] = array( */
+  /*   'menu_name' => 'menu-main-menu', */
+  /*   'link_path' => '<front>', */
+  /*   'router_path' => '', */
+  /*   'link_title' => 'Feedback', */
+  /*   'options' => array( */
+  /*     'attributes' => array( */
+  /*       'title' => '', */
+  /*     ), */
+  /*   ), */
+  /*   'module' => 'menu', */
+  /*   'hidden' => '0', */
+  /*   'external' => '1', */
+  /*   'has_children' => '0', */
+  /*   'expanded' => '0', */
+  /*   'weight' => '-38', */
+  /* ); */
+  // Exported menu link: menu-main-menu:aggregator
+  /* $menu_links['menu-main-menu:aggregator'] = array( */
+  /*   'menu_name' => 'menu-main-menu', */
+  /*   'link_path' => 'aggregator', */
+  /*   'router_path' => 'aggregator', */
+  /*   'link_title' => 'Feed Aggregator', */
+  /*   'options' => array( */
+  /*     'attributes' => array( */
+  /*       'title' => '', */
+  /*     ), */
+  /*   ), */
+  /*   'module' => 'menu', */
+  /*   'hidden' => '0', */
+  /*   'external' => '0', */
+  /*   'has_children' => '0', */
+  /*   'expanded' => '0', */
+  /*   'weight' => '-46', */
+  /* ); */
+  // Exported menu link: menu-main-menu:articles
+  /* $menu_links['menu-main-menu:articles'] = array( */
+  /*   'menu_name' => 'menu-main-menu', */
+  /*   'link_path' => 'articles', */
+  /*   'router_path' => 'articles', */
+  /*   'link_title' => 'Encyclopedia', */
+  /*   'options' => array( */
+  /*     'attributes' => array( */
+  /*       'title' => '', */
+  /*     ), */
+  /*   ), */
+  /*   'module' => 'menu', */
+  /*   'hidden' => '0', */
+  /*   'external' => '0', */
+  /*   'has_children' => '1', */
+  /*   'expanded' => '1', */
+  /*   'weight' => '-50', */
+  /* ); */
+  // Exported menu link: menu-main-menu:corrections
+  /* $menu_links['menu-main-menu:corrections'] = array( */
+  /*   'menu_name' => 'menu-main-menu', */
+  /*   'link_path' => 'corrections', */
+  /*   'router_path' => 'corrections', */
+  /*   'link_title' => 'Corrections', */
+  /*   'options' => array( */
+  /*     'attributes' => array( */
+  /*       'title' => '', */
+  /*     ), */
+  /*   ), */
+  /*   'module' => 'menu', */
+  /*   'hidden' => '0', */
+  /*   'external' => '0', */
+  /*   'has_children' => '0', */
+  /*   'expanded' => '0', */
+  /*   'weight' => '-41', */
+  /* ); */
+  // Exported menu link: menu-main-menu:forum
+  /* $menu_links['menu-main-menu:forum'] = array( */
+  /*   'menu_name' => 'menu-main-menu', */
+  /*   'link_path' => 'forum', */
+  /*   'router_path' => 'forum', */
+  /*   'link_title' => 'Forums', */
+  /*   'options' => array( */
+  /*     'attributes' => array( */
+  /*       'title' => '', */
+  /*     ), */
+  /*   ), */
+  /*   'module' => 'menu', */
+  /*   'hidden' => '0', */
+  /*   'external' => '0', */
+  /*   'has_children' => '0', */
+  /*   'expanded' => '0', */
+  /*   'weight' => '-39', */
+  /* ); */
+  /* // Exported menu link: menu-main-menu:gallery */
+  /* $menu_links['menu-main-menu:gallery'] = array( */
+  /*   'menu_name' => 'menu-main-menu', */
+  /*   'link_path' => 'gallery', */
+  /*   'router_path' => 'gallery', */
+  /*   'link_title' => 'Gallery', */
+  /*   'options' => array( */
+  /*     'attributes' => array( */
+  /*       'title' => '', */
+  /*     ), */
+  /*   ), */
+  /*   'module' => 'menu', */
+  /*   'hidden' => '0', */
+  /*   'external' => '0', */
+  /*   'has_children' => '1', */
+  /*   'expanded' => '1', */
+  /*   'weight' => '-48', */
+  /* ); */
+  /* // Exported menu link: menu-main-menu:node/add/article */
+  /* $menu_links['menu-main-menu:node/add/article'] = array( */
+  /*   'menu_name' => 'menu-main-menu', */
+  /*   'link_path' => 'node/add/article', */
+  /*   'router_path' => 'node/add/article', */
+  /*   'link_title' => 'Add article', */
+  /*   'options' => array( */
+  /*     'attributes' => array( */
+  /*       'title' => '', */
+  /*     ), */
+  /*   ), */
+  /*   'module' => 'menu', */
+  /*   'hidden' => '0', */
+  /*   'external' => '0', */
+  /*   'has_children' => '0', */
+  /*   'expanded' => '0', */
+  /*   'weight' => '0', */
+  /*   'parent_path' => 'articles', */
+  /* ); */
+  /* // Exported menu link: menu-main-menu:node/add/image */
+  /* $menu_links['menu-main-menu:node/add/image'] = array( */
+  /*   'menu_name' => 'menu-main-menu', */
+  /*   'link_path' => 'node/add/image', */
+  /*   'router_path' => 'node/add/image', */
+  /*   'link_title' => 'Add image', */
+  /*   'options' => array( */
+  /*     'attributes' => array( */
+  /*       'title' => '', */
+  /*     ), */
+  /*   ), */
+  /*   'module' => 'menu', */
+  /*   'hidden' => '0', */
+  /*   'external' => '0', */
+  /*   'has_children' => '0', */
+  /*   'expanded' => '1', */
+  /*   'weight' => '0', */
+  /*   'parent_path' => 'gallery', */
+  /* ); */
+  /* // Exported menu link: menu-main-menu:poll */
+  /* $menu_links['menu-main-menu:poll'] = array( */
+  /*   'menu_name' => 'menu-main-menu', */
+  /*   'link_path' => 'poll', */
+  /*   'router_path' => 'poll', */
+  /*   'link_title' => 'Polls', */
+  /*   'options' => array( */
+  /*     'attributes' => array( */
+  /*       'title' => '', */
+  /*     ), */
+  /*   ), */
+  /*   'module' => 'menu', */
+  /*   'hidden' => '0', */
+  /*   'external' => '0', */
+  /*   'has_children' => '0', */
+  /*   'expanded' => '0', */
+  /*   'weight' => '-40', */
+  /* ); */
+  /* // Exported menu link: menu-main-menu:squery */
+  /* $menu_links['menu-main-menu:squery'] = array( */
+  /*   'menu_name' => 'menu-main-menu', */
+  /*   'link_path' => 'squery', */
+  /*   'router_path' => 'squery', */
+  /*   'link_title' => 'SPARQL queries', */
+  /*   'options' => array( */
+  /*     'attributes' => array( */
+  /*       'title' => '', */
+  /*     ), */
+  /*   ), */
+  /*   'module' => 'menu', */
+  /*   'hidden' => '0', */
+  /*   'external' => '0', */
+  /*   'has_children' => '0', */
+  /*   'expanded' => '0', */
+  /*   'weight' => '-47', */
+  /* ); */
+  /* // Exported menu link: menu-main-menu:userpoints */
+  /* $menu_links['menu-main-menu:userpoints'] = array( */
+  /*   'menu_name' => 'menu-main-menu', */
+  /*   'link_path' => 'userpoints', */
+  /*   'router_path' => 'userpoints', */
+  /*   'link_title' => 'Userpoints', */
+  /*   'options' => array( */
+  /*     'attributes' => array( */
+  /*       'title' => '', */
+  /*     ), */
+  /*   ), */
+  /*   'module' => 'menu', */
+  /*   'hidden' => '0', */
+  /*   'external' => '0', */
+  /*   'has_children' => '0', */
+  /*   'expanded' => '0', */
+  /*   'weight' => '-44', */
+  /* ); */
+
   // Exported menu link: management:admin
   $menu_links['management:admin'] = array(
     'menu_name' => 'management',
@@ -186,206 +390,7 @@ function planetmath_menus_menu_default_menu_links() {
     'expanded' => '0',
     'weight' => '9',
   );
-  // Exported menu link: menu-main-menu:<front>
-  $menu_links['menu-main-menu:<front>'] = array(
-    'menu_name' => 'menu-main-menu',
-    'link_path' => '<front>',
-    'router_path' => '',
-    'link_title' => 'Feedback',
-    'options' => array(
-      'attributes' => array(
-        'title' => '',
-      ),
-    ),
-    'module' => 'menu',
-    'hidden' => '0',
-    'external' => '1',
-    'has_children' => '0',
-    'expanded' => '0',
-    'weight' => '-38',
-  );
-  // Exported menu link: menu-main-menu:aggregator
-  $menu_links['menu-main-menu:aggregator'] = array(
-    'menu_name' => 'menu-main-menu',
-    'link_path' => 'aggregator',
-    'router_path' => 'aggregator',
-    'link_title' => 'Feed Aggregator',
-    'options' => array(
-      'attributes' => array(
-        'title' => '',
-      ),
-    ),
-    'module' => 'menu',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '0',
-    'expanded' => '0',
-    'weight' => '-46',
-  );
-  // Exported menu link: menu-main-menu:articles
-  $menu_links['menu-main-menu:articles'] = array(
-    'menu_name' => 'menu-main-menu',
-    'link_path' => 'articles',
-    'router_path' => 'articles',
-    'link_title' => 'Encyclopedia',
-    'options' => array(
-      'attributes' => array(
-        'title' => '',
-      ),
-    ),
-    'module' => 'menu',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '1',
-    'expanded' => '1',
-    'weight' => '-50',
-  );
-  // Exported menu link: menu-main-menu:corrections
-  $menu_links['menu-main-menu:corrections'] = array(
-    'menu_name' => 'menu-main-menu',
-    'link_path' => 'corrections',
-    'router_path' => 'corrections',
-    'link_title' => 'Corrections',
-    'options' => array(
-      'attributes' => array(
-        'title' => '',
-      ),
-    ),
-    'module' => 'menu',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '0',
-    'expanded' => '0',
-    'weight' => '-41',
-  );
-  // Exported menu link: menu-main-menu:forum
-  $menu_links['menu-main-menu:forum'] = array(
-    'menu_name' => 'menu-main-menu',
-    'link_path' => 'forum',
-    'router_path' => 'forum',
-    'link_title' => 'Forums',
-    'options' => array(
-      'attributes' => array(
-        'title' => '',
-      ),
-    ),
-    'module' => 'menu',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '0',
-    'expanded' => '0',
-    'weight' => '-39',
-  );
-  // Exported menu link: menu-main-menu:gallery
-  $menu_links['menu-main-menu:gallery'] = array(
-    'menu_name' => 'menu-main-menu',
-    'link_path' => 'gallery',
-    'router_path' => 'gallery',
-    'link_title' => 'Gallery',
-    'options' => array(
-      'attributes' => array(
-        'title' => '',
-      ),
-    ),
-    'module' => 'menu',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '1',
-    'expanded' => '1',
-    'weight' => '-48',
-  );
-  // Exported menu link: menu-main-menu:node/add/article
-  $menu_links['menu-main-menu:node/add/article'] = array(
-    'menu_name' => 'menu-main-menu',
-    'link_path' => 'node/add/article',
-    'router_path' => 'node/add/article',
-    'link_title' => 'Add article',
-    'options' => array(
-      'attributes' => array(
-        'title' => '',
-      ),
-    ),
-    'module' => 'menu',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '0',
-    'expanded' => '0',
-    'weight' => '0',
-    'parent_path' => 'articles',
-  );
-  // Exported menu link: menu-main-menu:node/add/image
-  $menu_links['menu-main-menu:node/add/image'] = array(
-    'menu_name' => 'menu-main-menu',
-    'link_path' => 'node/add/image',
-    'router_path' => 'node/add/image',
-    'link_title' => 'Add image',
-    'options' => array(
-      'attributes' => array(
-        'title' => '',
-      ),
-    ),
-    'module' => 'menu',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '0',
-    'expanded' => '1',
-    'weight' => '0',
-    'parent_path' => 'gallery',
-  );
-  // Exported menu link: menu-main-menu:poll
-  $menu_links['menu-main-menu:poll'] = array(
-    'menu_name' => 'menu-main-menu',
-    'link_path' => 'poll',
-    'router_path' => 'poll',
-    'link_title' => 'Polls',
-    'options' => array(
-      'attributes' => array(
-        'title' => '',
-      ),
-    ),
-    'module' => 'menu',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '0',
-    'expanded' => '0',
-    'weight' => '-40',
-  );
-  // Exported menu link: menu-main-menu:squery
-  $menu_links['menu-main-menu:squery'] = array(
-    'menu_name' => 'menu-main-menu',
-    'link_path' => 'squery',
-    'router_path' => 'squery',
-    'link_title' => 'SPARQL queries',
-    'options' => array(
-      'attributes' => array(
-        'title' => '',
-      ),
-    ),
-    'module' => 'menu',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '0',
-    'expanded' => '0',
-    'weight' => '-47',
-  );
-  // Exported menu link: menu-main-menu:userpoints
-  $menu_links['menu-main-menu:userpoints'] = array(
-    'menu_name' => 'menu-main-menu',
-    'link_path' => 'userpoints',
-    'router_path' => 'userpoints',
-    'link_title' => 'Userpoints',
-    'options' => array(
-      'attributes' => array(
-        'title' => '',
-      ),
-    ),
-    'module' => 'menu',
-    'hidden' => '0',
-    'external' => '0',
-    'has_children' => '0',
-    'expanded' => '0',
-    'weight' => '-44',
-  );
+
   // Exported menu link: navigation:aggregator
   $menu_links['navigation:aggregator'] = array(
     'menu_name' => 'navigation',
diff --git a/profiles/planetmath/modules/features/planetmath_menus/planetmath_menus.info b/profiles/planetmath/modules/features/planetmath_menus/planetmath_menus.info
index b7ca6eb9..c421a1b5 100644
--- a/profiles/planetmath/modules/features/planetmath_menus/planetmath_menus.info
+++ b/profiles/planetmath/modules/features/planetmath_menus/planetmath_menus.info
@@ -20,17 +20,6 @@ features[menu_links][] = "main-menu:people"
 features[menu_links][] = "main-menu:problems"
 features[menu_links][] = "main-menu:solutions"
 features[menu_links][] = "management:admin"
-features[menu_links][] = "menu-main-menu:<front>"
-features[menu_links][] = "menu-main-menu:aggregator"
-features[menu_links][] = "menu-main-menu:articles"
-features[menu_links][] = "menu-main-menu:corrections"
-features[menu_links][] = "menu-main-menu:forum"
-features[menu_links][] = "menu-main-menu:gallery"
-features[menu_links][] = "menu-main-menu:node/add/article"
-features[menu_links][] = "menu-main-menu:node/add/image"
-features[menu_links][] = "menu-main-menu:poll"
-features[menu_links][] = "menu-main-menu:squery"
-features[menu_links][] = "menu-main-menu:userpoints"
 features[menu_links][] = "navigation:aggregator"
 features[menu_links][] = "navigation:aggregator/categories"
 features[menu_links][] = "navigation:aggregator/categories/1"
diff --git a/profiles/planetmath/modules/features/planetmath_views/planetmath_views.views_default.inc b/profiles/planetmath/modules/features/planetmath_views/planetmath_views.views_default.inc
index 74a30d56..3723d27c 100644
--- a/profiles/planetmath/modules/features/planetmath_views/planetmath_views.views_default.inc
+++ b/profiles/planetmath/modules/features/planetmath_views/planetmath_views.views_default.inc
@@ -659,6 +659,220 @@ else if (!$field_correction_closed){
   );
   $export['og_list'] = $view;
 
+  $view = new view;
+  $view->name = 'people';
+  $view->description = '';
+  $view->tag = 'default';
+  $view->base_table = 'users';
+  $view->human_name = 'People';
+  $view->core = 7;
+  $view->api_version = '3.0';
+  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
+
+  /* Display: Master */
+  $handler = $view->new_display('default', 'Master', 'default');
+  $handler->display->display_options['title'] = 'People';
+  $handler->display->display_options['access']['type'] = 'none';
+  $handler->display->display_options['cache']['type'] = 'none';
+  $handler->display->display_options['query']['type'] = 'views_query';
+  $handler->display->display_options['query']['options']['query_comment'] = FALSE;
+  $handler->display->display_options['exposed_form']['type'] = 'basic';
+  $handler->display->display_options['pager']['type'] = 'full';
+  $handler->display->display_options['pager']['options']['items_per_page'] = '20';
+  $handler->display->display_options['pager']['options']['offset'] = '0';
+  $handler->display->display_options['pager']['options']['id'] = '0';
+  $handler->display->display_options['pager']['options']['expose']['items_per_page_options_all'] = 0;
+  $handler->display->display_options['style_plugin'] = 'table';
+  $handler->display->display_options['style_options']['grouping'] = '';
+  $handler->display->display_options['style_options']['columns'] = array(
+    'name' => 'name',
+    'field_user_forename' => 'field_user_forename',
+    'field_user_surname' => 'field_user_surname',
+    'field_user_score' => 'field_user_score',
+  );
+  $handler->display->display_options['style_options']['default'] = 'field_user_score';
+  $handler->display->display_options['style_options']['info'] = array(
+    'name' => array(
+      'sortable' => 1,
+      'default_sort_order' => 'desc',
+      'align' => '',
+      'separator' => '',
+    ),
+    'field_user_forename' => array(
+      'sortable' => 1,
+      'default_sort_order' => 'asc',
+      'align' => '',
+      'separator' => '',
+    ),
+    'field_user_surname' => array(
+      'sortable' => 1,
+      'default_sort_order' => 'desc',
+      'align' => '',
+      'separator' => '',
+    ),
+    'field_user_score' => array(
+      'sortable' => 1,
+      'default_sort_order' => 'desc',
+      'align' => '',
+      'separator' => '',
+    ),
+  );
+  $handler->display->display_options['style_options']['override'] = 1;
+  $handler->display->display_options['style_options']['sticky'] = 1;
+  $handler->display->display_options['style_options']['order'] = 'desc';
+  $handler->display->display_options['style_options']['empty_table'] = 0;
+  /* Field: User: Name */
+  $handler->display->display_options['fields']['name']['id'] = 'name';
+  $handler->display->display_options['fields']['name']['table'] = 'users';
+  $handler->display->display_options['fields']['name']['field'] = 'name';
+  $handler->display->display_options['fields']['name']['label'] = 'Username';
+  $handler->display->display_options['fields']['name']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['name']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['name']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['name']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['name']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['name']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['name']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['name']['alter']['word_boundary'] = 0;
+  $handler->display->display_options['fields']['name']['alter']['ellipsis'] = 0;
+  $handler->display->display_options['fields']['name']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['name']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['name']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['name']['element_label_colon'] = 1;
+  $handler->display->display_options['fields']['name']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['name']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['name']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['name']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['name']['link_to_user'] = 1;
+  $handler->display->display_options['fields']['name']['overwrite_anonymous'] = 0;
+  /* Field: User: Forename */
+  $handler->display->display_options['fields']['field_user_forename']['id'] = 'field_user_forename';
+  $handler->display->display_options['fields']['field_user_forename']['table'] = 'field_data_field_user_forename';
+  $handler->display->display_options['fields']['field_user_forename']['field'] = 'field_user_forename';
+  $handler->display->display_options['fields']['field_user_forename']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_user_forename']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_user_forename']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_user_forename']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_user_forename']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_user_forename']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_user_forename']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_user_forename']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_user_forename']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_user_forename']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_user_forename']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_user_forename']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_user_forename']['element_label_colon'] = 1;
+  $handler->display->display_options['fields']['field_user_forename']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_user_forename']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_user_forename']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_user_forename']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_user_forename']['field_api_classes'] = 0;
+  /* Field: User: Surname */
+  $handler->display->display_options['fields']['field_user_surname']['id'] = 'field_user_surname';
+  $handler->display->display_options['fields']['field_user_surname']['table'] = 'field_data_field_user_surname';
+  $handler->display->display_options['fields']['field_user_surname']['field'] = 'field_user_surname';
+  /* Field: User: Score */
+  $handler->display->display_options['fields']['field_user_score']['id'] = 'field_user_score';
+  $handler->display->display_options['fields']['field_user_score']['table'] = 'field_data_field_user_score';
+  $handler->display->display_options['fields']['field_user_score']['field'] = 'field_user_score';
+  $handler->display->display_options['fields']['field_user_score']['alter']['alter_text'] = 0;
+  $handler->display->display_options['fields']['field_user_score']['alter']['make_link'] = 0;
+  $handler->display->display_options['fields']['field_user_score']['alter']['absolute'] = 0;
+  $handler->display->display_options['fields']['field_user_score']['alter']['external'] = 0;
+  $handler->display->display_options['fields']['field_user_score']['alter']['replace_spaces'] = 0;
+  $handler->display->display_options['fields']['field_user_score']['alter']['trim_whitespace'] = 0;
+  $handler->display->display_options['fields']['field_user_score']['alter']['nl2br'] = 0;
+  $handler->display->display_options['fields']['field_user_score']['alter']['word_boundary'] = 1;
+  $handler->display->display_options['fields']['field_user_score']['alter']['ellipsis'] = 1;
+  $handler->display->display_options['fields']['field_user_score']['alter']['strip_tags'] = 0;
+  $handler->display->display_options['fields']['field_user_score']['alter']['trim'] = 0;
+  $handler->display->display_options['fields']['field_user_score']['alter']['html'] = 0;
+  $handler->display->display_options['fields']['field_user_score']['element_label_colon'] = 1;
+  $handler->display->display_options['fields']['field_user_score']['element_default_classes'] = 1;
+  $handler->display->display_options['fields']['field_user_score']['hide_empty'] = 0;
+  $handler->display->display_options['fields']['field_user_score']['empty_zero'] = 0;
+  $handler->display->display_options['fields']['field_user_score']['hide_alter_empty'] = 0;
+  $handler->display->display_options['fields']['field_user_score']['settings'] = array(
+    'thousand_separator' => ' ',
+    'prefix_suffix' => 1,
+  );
+  $handler->display->display_options['fields']['field_user_score']['field_api_classes'] = 0;
+  /* Sort criterion: User: Created date */
+  $handler->display->display_options['sorts']['created']['id'] = 'created';
+  $handler->display->display_options['sorts']['created']['table'] = 'users';
+  $handler->display->display_options['sorts']['created']['field'] = 'created';
+  $handler->display->display_options['sorts']['created']['order'] = 'DESC';
+  /* Filter criterion: User: Active */
+  $handler->display->display_options['filters']['status']['id'] = 'status';
+  $handler->display->display_options['filters']['status']['table'] = 'users';
+  $handler->display->display_options['filters']['status']['field'] = 'status';
+  $handler->display->display_options['filters']['status']['value'] = '1';
+  $handler->display->display_options['filters']['status']['group'] = 0;
+  $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
+  /* Filter criterion: User: Forename (field_user_forename) */
+  $handler->display->display_options['filters']['field_user_forename_value']['id'] = 'field_user_forename_value';
+  $handler->display->display_options['filters']['field_user_forename_value']['table'] = 'field_data_field_user_forename';
+  $handler->display->display_options['filters']['field_user_forename_value']['field'] = 'field_user_forename_value';
+  $handler->display->display_options['filters']['field_user_forename_value']['operator'] = 'word';
+  $handler->display->display_options['filters']['field_user_forename_value']['group'] = '0';
+  $handler->display->display_options['filters']['field_user_forename_value']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['field_user_forename_value']['expose']['operator_id'] = 'field_user_forename_value_op';
+  $handler->display->display_options['filters']['field_user_forename_value']['expose']['label'] = 'Forename';
+  $handler->display->display_options['filters']['field_user_forename_value']['expose']['operator'] = 'field_user_forename_value_op';
+  $handler->display->display_options['filters']['field_user_forename_value']['expose']['identifier'] = 'field_user_forename_value';
+  $handler->display->display_options['filters']['field_user_forename_value']['expose']['required'] = 0;
+  $handler->display->display_options['filters']['field_user_forename_value']['expose']['multiple'] = FALSE;
+  /* Filter criterion: User: Surname (field_user_surname) */
+  $handler->display->display_options['filters']['field_user_surname_value']['id'] = 'field_user_surname_value';
+  $handler->display->display_options['filters']['field_user_surname_value']['table'] = 'field_data_field_user_surname';
+  $handler->display->display_options['filters']['field_user_surname_value']['field'] = 'field_user_surname_value';
+  $handler->display->display_options['filters']['field_user_surname_value']['operator'] = 'word';
+  $handler->display->display_options['filters']['field_user_surname_value']['group'] = '0';
+  $handler->display->display_options['filters']['field_user_surname_value']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['field_user_surname_value']['expose']['operator_id'] = 'field_user_surname_value_op';
+  $handler->display->display_options['filters']['field_user_surname_value']['expose']['label'] = 'Surname';
+  $handler->display->display_options['filters']['field_user_surname_value']['expose']['operator'] = 'field_user_surname_value_op';
+  $handler->display->display_options['filters']['field_user_surname_value']['expose']['identifier'] = 'field_user_surname_value';
+  $handler->display->display_options['filters']['field_user_surname_value']['expose']['required'] = 0;
+  $handler->display->display_options['filters']['field_user_surname_value']['expose']['multiple'] = FALSE;
+  /* Filter criterion: User: Name */
+  $handler->display->display_options['filters']['uid']['id'] = 'uid';
+  $handler->display->display_options['filters']['uid']['table'] = 'users';
+  $handler->display->display_options['filters']['uid']['field'] = 'uid';
+  $handler->display->display_options['filters']['uid']['value'] = '';
+  $handler->display->display_options['filters']['uid']['group'] = '0';
+  $handler->display->display_options['filters']['uid']['exposed'] = TRUE;
+  $handler->display->display_options['filters']['uid']['expose']['operator_id'] = 'uid_op';
+  $handler->display->display_options['filters']['uid']['expose']['label'] = 'Username';
+  $handler->display->display_options['filters']['uid']['expose']['operator'] = 'uid_op';
+  $handler->display->display_options['filters']['uid']['expose']['identifier'] = 'uid';
+  $handler->display->display_options['filters']['uid']['expose']['multiple'] = FALSE;
+  $handler->display->display_options['filters']['uid']['expose']['reduce'] = 0;
+
+  /* Display: Page */
+  $handler = $view->new_display('page', 'Page', 'page');
+  $handler->display->display_options['path'] = 'people';
+  $translatables['people'] = array(
+    t('Master'),
+    t('People'),
+    t('more'),
+    t('Apply'),
+    t('Reset'),
+    t('Sort by'),
+    t('Asc'),
+    t('Desc'),
+    t('Items per page'),
+    t('- All -'),
+    t('Offset'),
+    t('Username'),
+    t('Forename'),
+    t('Surname'),
+    t('Score'),
+    t('Page'),
+  );
+  $export['people'] = $view;
+
+
   $view = new view;
   $view->name = 'problems';
   $view->description = '';
diff --git a/profiles/planetmath/planetmath.info b/profiles/planetmath/planetmath.info
index aace0e49..4ab78a62 100644
--- a/profiles/planetmath/planetmath.info
+++ b/profiles/planetmath/planetmath.info
@@ -77,9 +77,11 @@ dependencies[] = relation_dummy_field
 dependencies[] = relation_endpoint
 dependencies[] = relation_entity_collector
 dependencies[] = relation_select
+dependencies[] = rdfx
 dependencies[] = rules
 dependencies[] = rules_scheduler
 dependencies[] = rules_admin
+dependencies[] = sparql
 dependencies[] = wysiwyg
 dependencies[] = userpoints
 dependencies[] = userpoints_nc
diff --git a/profiles/planetmath/planetmath.profile b/profiles/planetmath/planetmath.profile
index 915a8031..7ebf6e37 100644
--- a/profiles/planetmath/planetmath.profile
+++ b/profiles/planetmath/planetmath.profile
@@ -167,13 +167,13 @@ function planetmath_install_tasks($install_state) {
                                         'run' => INSTALL_TASK_RUN_IF_NOT_COMPLETED,
                                         'function' => 'planetmath_profile_setup_permissions',
                                         ),
-                 'my_13th_task' => array(
-                                        'display_name' => st('Configure Menus'),
-                                        'display' => TRUE,
-                                        'type' => 'normal',
-                                        'run' => INSTALL_TASK_RUN_IF_NOT_COMPLETED,
-                                        'function' => 'planetmath_profile_setup_menus',
-                                        ),
+                 /* 'my_13th_task' => array( */
+                 /*                        'display_name' => st('Configure Menus'), */
+                 /*                        'display' => TRUE, */
+                 /*                        'type' => 'normal', */
+                 /*                        'run' => INSTALL_TASK_RUN_IF_NOT_COMPLETED, */
+                 /*                        'function' => 'planetmath_profile_setup_menus', */
+                 /*                        ), */
                  'my_14th_task' => array(
                                         'display_name' => st('Choose and install the theme'),
                                         'display' => TRUE,
@@ -754,6 +754,9 @@ function planetmath_profile_configure_blocks () {
   $admin_theme = variable_get(admin_theme);
 
   $blocks = array(
+		  // note that visibility => 0 is "all pages except those listed"
+		  // note that visibility => 1 is "Only the listed pages"
+		  // note that visibility => 2 is what you use for custom PHP logic
                   array(
                         'module' => 'system',
                         'delta' => 'main',
@@ -761,6 +764,7 @@ function planetmath_profile_configure_blocks () {
                         'status' => 1,
                         'weight' => 0,
                         'region' => 'content',
+                        'visibility' => 0,
                         'pages' => '',
                         'cache' => -1,
                         ),
@@ -769,8 +773,9 @@ function planetmath_profile_configure_blocks () {
                         'delta' => 'form',
                         'theme' => $theme_default,
                         'status' => 1,
-                        'weight' => -1,
-                        'region' => 'sidebar_first',
+                        'weight' => -26,
+                        'region' => 'header',
+                        'visibility' => 0,
                         'pages' => '',
                         'cache' => -1,
                         ),
@@ -781,6 +786,7 @@ function planetmath_profile_configure_blocks () {
                         'status' => 1,
                         'weight' => 10,
                         'region' => 'dashboard_main',
+                        'visibility' => 0,
                         'pages' => '',
                         'cache' => -1,
                         ),
@@ -791,6 +797,7 @@ function planetmath_profile_configure_blocks () {
                         'status' => 1,
                         'weight' => 0,
                         'region' => 'sidebar_first',
+                        'visibility' => 0,
                         'pages' => '',
                         'cache' => -1,
                         ),
@@ -801,6 +808,7 @@ function planetmath_profile_configure_blocks () {
                         'status' => 1,
                         'weight' => 0,
                         'region' => 'sidebar_first',
+                        'visibility' => 0,
                         'pages' => '',
                         'cache' => -1,
                         ),
@@ -811,6 +819,7 @@ function planetmath_profile_configure_blocks () {
                         'status' => 1,
                         'weight' => 10,
                         'region' => 'footer',
+                        'visibility' => 0,
                         'pages' => '',
                         'cache' => -1,
                         ),
@@ -821,6 +830,91 @@ function planetmath_profile_configure_blocks () {
                         'status' => 1,
                         'weight' => 0,
                         'region' => 'help',
+                        'visibility' => 0,
+                        'pages' => '',
+                        'cache' => -1,
+                        ),
+		  // turn some stuff off
+                  array(
+                        'module' => 'devel_node_access',
+                        'delta' => 'dna_node',
+                        'theme' => $theme_default,
+                        'status' => 0,
+                        'weight' => 0,
+                        'region' => 'help',
+                        'visibility' => 0,
+                        'pages' => '',
+                        'cache' => -1,
+                        ),
+                  array(
+                        'module' => 'forum',
+                        'delta' => 'active',
+                        'theme' => $theme_default,
+                        'status' => 0,
+                        'weight' => 0,
+                        'region' => 'help',
+                        'visibility' => 0,
+                        'pages' => '',
+                        'cache' => -1,
+                        ),
+                  array(
+                        'module' => 'forum',
+                        'delta' => 'new',
+                        'theme' => $theme_default,
+                        'status' => 0,
+                        'weight' => 0,
+                        'region' => 'help',
+                        'visibility' => 0,
+                        'pages' => '',
+                        'cache' => -1,
+                        ),
+		  array(
+                        'module' => 'forum',
+                        'delta' => 'new',
+                        'theme' => $theme_default,
+                        'status' => 0,
+                        'weight' => 0,
+                        'region' => 'help',
+                        'visibility' => 0,
+                        'pages' => '',
+                        'cache' => -1,
+                        ),
+		  // might be reasonable to show this on the "People" page, ... which
+		  // I'm realizing didn't make it through the migration for some
+		  // reason.
+		  array(
+                        'module' => 'user',
+                        'delta' => 'online',
+                        'theme' => $theme_default,
+                        'status' => 0,
+                        'weight' => 0,
+                        'region' => 'help',
+                        'visibility' => 0,
+                        'pages' => '',
+                        'cache' => -1,
+                        ),
+		  array(
+                        'module' => 'relation_entity_collector',
+                        'delta' => 'block',
+                        'theme' => $theme_default,
+                        'status' => 0,
+                        'weight' => 0,
+                        'region' => 'help',
+                        'visibility' => 0,
+                        'pages' => '',
+                        'cache' => -1,
+                        ),
+		  // it might be good to enable a second block below
+		  // the main menu (for admin-level tasks) but let's skip
+		  // that for now
+                  array(
+                        'module' => 'system',
+                        'delta' => 'management',
+                        'theme' => $theme_default,
+                        'status' => 0,
+                        'weight' => -5,
+                        'region' => -1,
+                        'visibility' => 0,
                         'pages' => '',
                         'cache' => -1,
                         ),
@@ -831,6 +925,7 @@ function planetmath_profile_configure_blocks () {
                         'status' => 1,
                         'weight' => 0,
                         'region' => 'content',
+                        'visibility' => 0,
                         'pages' => '',
                         'cache' => -1,
                         ),
@@ -841,6 +936,7 @@ function planetmath_profile_configure_blocks () {
                         'status' => 1,
                         'weight' => 0,
                         'region' => 'help',
+                        'visibility' => 0,
                         'pages' => '',
                         'cache' => -1,
                         ),
@@ -851,6 +947,7 @@ function planetmath_profile_configure_blocks () {
                         'status' => 1,
                         'weight' => 10,
                         'region' => 'content',
+                        'visibility' => 0,
                         'pages' => '',
                         'cache' => -1,
                         ),
@@ -861,6 +958,7 @@ function planetmath_profile_configure_blocks () {
                         'status' => 1,
                         'weight' => 0,
                         'region' => 'dashboard_sidebar',
+                        'visibility' => 0,
                         'pages' => '',
                         'cache' => -1,
                         ),
@@ -868,15 +966,79 @@ function planetmath_profile_configure_blocks () {
                         'module' => 'search',
                         'delta' => 'form',
                         'theme' => $admin_theme,
-                        'status' => 1,
-                        'weight' => -10,
-                        'region' => 'dashboard_sidebar',
+                        'status' => 0,
+                        'weight' => -26,
+                        'region' => 'header',
+                        'visibility' => 0,
                         'pages' => '',
                         'cache' => -1,
                         ),
+		  // Configure the custom blocks that are supposed to
+		  // appear in the sidebar.  This could presumably be
+		  // done from within the planetmath_blocks module itself
+                  // but no harm prototyping here.
+                  array(
+                        'module' => 'planetmath_blocks',
+                        'delta' => 'news',
+                        'theme' => $theme_default,
+                        'status' => 1,
+                        'weight' => -32,
+                        'region' => 'sidebar_second',
+                        'visibility' => 1,
+                        'pages' => '<front>',
+                        'cache' => 1,
+                        ),
+		  // this is giving an error claiming that
+		  // `field_data_field_correction_article' doesn't exist
+		  // commenting out for now
+/*                   array( */
+/*                         'module' => 'planetmath_blocks', */
+/*                         'delta' => 'correction', */
+/*                         'theme' => $theme_default, */
+/*                         'status' => 1, */
+/*                         'weight' => -30, */
+/*                         'region' => 'sidebar_second', */
+/*                         'pages' => '<?php if(arg(0) == "node"){ */
+/*  return planetmath_blocks_countCorrectionsPerArticle(arg(1)); */
+/* } */
+/* return false; */
+/* ?>', */
+/*                         'cache' => 1, */
+/*                         ), */
+                  array(
+                        'module' => 'planetmath_blocks',
+                        'delta' => 'pversion',
+                        'theme' => $theme_default,
+                        'status' => 1,
+                        'weight' => -34,
+                        'region' => 'sidebar_second',
+                        'visibility' => 2,
+                        'pages' => '<?php 
+if(drupal_is_front_page()){
+  return false;
+}
+if(arg(0) == "node"){
+ return planetmath_blocks_countVersionsPerArticle(arg(1));
+}
+return false;
+?>',
+                        'cache' => 1,
+                        ),
+		  array(
+                        'module' => 'planetmath_blocks',
+                        'delta' => 'userlist',
+                        'theme' => $theme_default,
+                        'status' => 1,
+                        'weight' => -33,
+                        'region' => 'sidebar_second',
+                        'visibility' => 1,
+                        'pages' => '<front>',
+                        'cache' => 1,
+                        ),
+
                   );
   foreach ($blocks as $block) {
-    dd($block, "CONFIGURING... ");
+    //dd($block, "CONFIGURING... ");
     db_merge('block')
       ->key(array('module'=>$block['module'],
 		  'theme'=>$block['theme'],
@@ -887,6 +1049,7 @@ function planetmath_profile_configure_blocks () {
 		     'status' => $block['status'],
 		     'weight' => $block['weight'],
 		     'region' => $block['region'],
+		     'visibility' => $block['visibility'],
 		     'pages' => $block['pages'],
 		     'cache' => $block['cache']))
       ->execute();
@@ -934,146 +1097,150 @@ function planetmath_profile_rdf_mappings () {
 function planetmath_profile_set_userpoints_variables () {
   dd("Profile- In planetmath_profile_set_userpoints_variables");
 
-  variable_set('userpoints_category_default_tid', 's:1:"0";');
-  variable_set('userpoints_category_default_vid', 's:1:"3";');
-  variable_set('userpoints_category_profile_display_tid', 'a:2:{s:13:"uncategorized";s:13:"uncategorized";s:3:"all";s:3:"all";}');
-  variable_set('userpoints_display_message', 's:1:"1";');
-  variable_set('userpoints_expireafter_date', 's:0:"";');
-  variable_set('userpoints_expireon_date', 'a:3:{s:5:"month";s:1:"1";s:3:"day";s:1:"1";s:4:"year";s:4:"1980";}');
-  variable_set('userpoints_expiry_description', 's:0:"";');
-  variable_set('userpoints_nc_category', 's:1:"0";');
-  variable_set('userpoints_nc_category_correction', 's:1:"0";');
-  variable_set('userpoints_nc_category_forum', 's:1:"0";');
-  variable_set('userpoints_nc_category_group', 's:1:"0";');
-  variable_set('userpoints_nc_category_image', 's:1:"0";');
-  variable_set('userpoints_nc_category_news', 's:1:"0";');
-  variable_set('userpoints_nc_category_page', 's:1:"0";');
-  variable_set('userpoints_nc_category_request', 's:1:"0";');
-  variable_set('userpoints_nc_comment_category', 's:1:"0";');
-  variable_set('userpoints_nc_comment_category_correction', 's:1:"0";');
-  variable_set('userpoints_nc_comment_category_forum', 's:1:"0";');
-  variable_set('userpoints_nc_comment_category_group', 's:1:"0";');
-  variable_set('userpoints_nc_comment_category_image', 's:1:"0";');
-  variable_set('userpoints_nc_comment_category_news', 's:1:"0";');
-  variable_set('userpoints_nc_comment_category_page', 's:1:"0";');
-  variable_set('userpoints_nc_comment_category_request', 's:1:"0";');
-  variable_set('userpoints_nc_comment_delete_deduct', 'i:1;');
-  variable_set('userpoints_nc_comment_delete_deduct_correction', 'i:1;');
-  variable_set('userpoints_nc_comment_delete_deduct_forum', 'i:1;');
-  variable_set('userpoints_nc_comment_delete_deduct_group', 'i:1;');
-  variable_set('userpoints_nc_comment_delete_deduct_image', 'i:1;');
-  variable_set('userpoints_nc_comment_delete_deduct_news', 'i:1;');
-  variable_set('userpoints_nc_comment_delete_deduct_page', 'i:1;');
-  variable_set('userpoints_nc_comment_delete_deduct_request', 'i:1;');
-  variable_set('userpoints_nc_comment_enabled', 'i:1;');
-  variable_set('userpoints_nc_comment_enabled_correction', 'i:1;');
-  variable_set('userpoints_nc_comment_enabled_forum', 'i:1;');
-  variable_set('userpoints_nc_comment_enabled_group', 'i:1;');
-  variable_set('userpoints_nc_comment_enabled_image', 'i:1;');
-  variable_set('userpoints_nc_comment_enabled_news', 'i:1;');
-  variable_set('userpoints_nc_comment_enabled_page', 'i:1;');
-  variable_set('userpoints_nc_comment_enabled_request', 'i:1;');
-  variable_set('userpoints_nc_comment_ownership_deduct', 'i:1;');
-  variable_set('userpoints_nc_comment_ownership_deduct_correction', 'i:1;');
-  variable_set('userpoints_nc_comment_ownership_deduct_forum', 'i:1;');
-  variable_set('userpoints_nc_comment_ownership_deduct_group', 'i:1;');
-  variable_set('userpoints_nc_comment_ownership_deduct_image', 'i:1;');
-  variable_set('userpoints_nc_comment_ownership_deduct_news', 'i:1;');
-  variable_set('userpoints_nc_comment_ownership_deduct_page', 'i:1;');
-  variable_set('userpoints_nc_comment_ownership_deduct_request', 'i:1;');
-  variable_set('userpoints_nc_comment_points', 's:1:"1";');
-  variable_set('userpoints_nc_comment_points_correction', 's:1:"1";');
-  variable_set('userpoints_nc_comment_points_forum', 's:1:"1";');
-  variable_set('userpoints_nc_comment_points_group', 's:1:"1";');
-  variable_set('userpoints_nc_comment_points_image', 's:1:"1";');
-  variable_set('userpoints_nc_comment_points_news', 's:1:"1";');
-  variable_set('userpoints_nc_comment_points_page', 's:1:"1";');
-  variable_set('userpoints_nc_comment_points_request', 's:1:"1";');
-  variable_set('userpoints_nc_comment_published_only', 'i:1;');
-  variable_set('userpoints_nc_delete_deduct', 'i:1;');
-  variable_set('userpoints_nc_delete_deduct_correction', 'i:1;');
-  variable_set('userpoints_nc_delete_deduct_forum', 'i:1;');
-  variable_set('userpoints_nc_delete_deduct_group', 'i:1;');
-  variable_set('userpoints_nc_delete_deduct_image', 'i:1;');
-  variable_set('userpoints_nc_delete_deduct_news', 'i:1;');
-  variable_set('userpoints_nc_delete_deduct_page', 'i:1;');
-  variable_set('userpoints_nc_delete_deduct_request', 'i:1;');
-  variable_set('userpoints_nc_enabled', 'i:1;');
-  variable_set('userpoints_nc_enabled_correction', 'i:1;');
-  variable_set('userpoints_nc_enabled_forum', 'i:1;');
-  variable_set('userpoints_nc_enabled_group', 'i:1;');
-  variable_set('userpoints_nc_enabled_image', 'i:1;');
-  variable_set('userpoints_nc_enabled_news', 'i:1;');
-  variable_set('userpoints_nc_enabled_page', 'i:1;');
-  variable_set('userpoints_nc_enabled_request', 'i:1;');
-  variable_set('userpoints_nc_ownership_deduct', 'i:1;');
-  variable_set('userpoints_nc_ownership_deduct_correction', 'i:1;');
-  variable_set('userpoints_nc_ownership_deduct_forum', 'i:1;');
-  variable_set('userpoints_nc_ownership_deduct_group', 'i:1;');
-  variable_set('userpoints_nc_ownership_deduct_image', 'i:1;');
-  variable_set('userpoints_nc_ownership_deduct_news', 'i:1;');
-  variable_set('userpoints_nc_ownership_deduct_page', 'i:1;');
-  variable_set('userpoints_nc_ownership_deduct_request', 'i:1;');
-  variable_set('userpoints_nc_points', 's:3:"100";');
-  variable_set('userpoints_nc_points_correction', 's:1:"5";');
-  variable_set('userpoints_nc_points_forum', 's:1:"5";');
-  variable_set('userpoints_nc_points_group', 's:1:"1";');
-  variable_set('userpoints_nc_points_image', 's:2:"10";');
-  variable_set('userpoints_nc_points_news', 's:3:"100";');
-  variable_set('userpoints_nc_points_page', 's:1:"1";');
-  variable_set('userpoints_nc_points_request', 's:1:"1";');
-  variable_set('userpoints_nc_published_only', 'i:1;');
-  variable_set('userpoints_nc_revision_category', 's:1:"0";');
-  variable_set('userpoints_nc_revision_category_correction', 's:1:"0";');
-  variable_set('userpoints_nc_revision_category_forum', 's:1:"0";');
-  variable_set('userpoints_nc_revision_category_group', 's:1:"0";');
-  variable_set('userpoints_nc_revision_category_image', 's:1:"0";');
-  variable_set('userpoints_nc_revision_category_news', 's:1:"0";');
-  variable_set('userpoints_nc_revision_category_page', 's:1:"0";');
-  variable_set('userpoints_nc_revision_category_request', 's:1:"0";');
-  variable_set('userpoints_nc_revision_enabled', 'i:1;');
-  variable_set('userpoints_nc_revision_enabled_correction', 'i:1;');
-  variable_set('userpoints_nc_revision_enabled_forum', 'i:1;');
-  variable_set('userpoints_nc_revision_enabled_group', 'i:1;');
-  variable_set('userpoints_nc_revision_enabled_image', 'i:1;');
-  variable_set('userpoints_nc_revision_enabled_news', 'i:1;');
-  variable_set('userpoints_nc_revision_enabled_page', 'i:1;');
-  variable_set('userpoints_nc_revision_enabled_request', 'i:1;');
-  variable_set('userpoints_nc_revision_own_nodes', 'i:0;');
-  variable_set('userpoints_nc_revision_own_nodes_correction', 'i:0;');
-  variable_set('userpoints_nc_revision_own_nodes_forum', 'i:0;');
-  variable_set('userpoints_nc_revision_own_nodes_group', 'i:0;');
-  variable_set('userpoints_nc_revision_own_nodes_image', 'i:0;');
-  variable_set('userpoints_nc_revision_own_nodes_news', 'i:0;');
-  variable_set('userpoints_nc_revision_own_nodes_page', 'i:0;');
-  variable_set('userpoints_nc_revision_own_nodes_request', 'i:0;');
-  variable_set('userpoints_nc_revision_points', 's:1:"5";');
-  variable_set('userpoints_nc_revision_points_correction', 's:1:"1";');
-  variable_set('userpoints_nc_revision_points_forum', 's:1:"0";');
-  variable_set('userpoints_nc_revision_points_group', 's:1:"1";');
-  variable_set('userpoints_nc_revision_points_image', 's:1:"5";');
-  variable_set('userpoints_nc_revision_points_news', 's:1:"5";');
-  variable_set('userpoints_nc_revision_points_page', 's:1:"1";');
-  variable_set('userpoints_nc_revision_points_request', 's:1:"1";');
-  variable_set('userpoints_points_moderation', 's:1:"0";');
-  variable_set('userpoints_report_displayzero', 's:1:"1";');
-  variable_set('userpoints_report_limit', 's:2:"10";');
-  variable_set('userpoints_report_usercount', 's:2:"30";');
-  variable_set('userpoints_transaction_timestamp', 'i:1;');
-  variable_set('userpoints_trans_lcpoint', 's:5:"point";');
-  variable_set('userpoints_trans_lcpoints', 's:5:"score";');
-  variable_set('userpoints_trans_ucpoint', 's:5:"Point";');
-  variable_set('userpoints_trans_ucpoints', 's:5:"Score";');
-  variable_set('userpoints_trans_uncat', 's:7:"General";');
-  variable_set('userpoints_truncate', 's:2:"30";');
-
-  variable_set('additional_settings__active_tab_correction', 's:27:"edit-userpoints-nc-revision";');
-  variable_set('additional_settings__active_tab_forum', 's:27:"edit-userpoints-nc-revision";');
-  variable_set('additional_settings__active_tab_group', 's:27:"edit-userpoints-nc-revision";');
-  variable_set('additional_settings__active_tab_image', 's:27:"edit-userpoints-nc-revision";');
-  variable_set('additional_settings__active_tab_page', 's:27:"edit-userpoints-nc-revision";');
-  variable_set('additional_settings__active_tab_request', 's:27:"edit-userpoints-nc-revision";');
-  variable_set('settings_additional__active_tab', 's:26:"edit-userpoints-nc-comment";');
+  variable_set('userpoints_category_default_tid', '0');
+  variable_set('userpoints_category_default_vid', '3');
+  variable_set('userpoints_category_profile_display_tid', array('uncategorized'=>'uncategorized',
+								'all'=>'all'));
+  variable_set('userpoints_display_message', '1');
+  variable_set('userpoints_expireafter_date', '');
+  // this setting is a bit strange
+  variable_set('userpoints_expireon_date', array('month'=>'1',
+						 'day'=>'1',
+						 'year'=>'1980'));
+  variable_set('userpoints_expiry_description', '');
+  variable_set('userpoints_nc_category', '0');
+  variable_set('userpoints_nc_category_correction', '0');
+  variable_set('userpoints_nc_category_forum', '0');
+  variable_set('userpoints_nc_category_group', '0');
+  variable_set('userpoints_nc_category_image', '0');
+  variable_set('userpoints_nc_category_news', '0');
+  variable_set('userpoints_nc_category_page', '0');
+  variable_set('userpoints_nc_category_request', '0');
+  variable_set('userpoints_nc_comment_category', '0');
+  variable_set('userpoints_nc_comment_category_correction', '0');
+  variable_set('userpoints_nc_comment_category_forum', '0');
+  variable_set('userpoints_nc_comment_category_group', '0');
+  variable_set('userpoints_nc_comment_category_image', '0');
+  variable_set('userpoints_nc_comment_category_news', '0');
+  variable_set('userpoints_nc_comment_category_page', '0');
+  variable_set('userpoints_nc_comment_category_request', '0');
+  variable_set('userpoints_nc_comment_delete_deduct', 1);
+  variable_set('userpoints_nc_comment_delete_deduct_correction', 1);
+  variable_set('userpoints_nc_comment_delete_deduct_forum', 1);
+  variable_set('userpoints_nc_comment_delete_deduct_group', 1);
+  variable_set('userpoints_nc_comment_delete_deduct_image', 1);
+  variable_set('userpoints_nc_comment_delete_deduct_news', 1);
+  variable_set('userpoints_nc_comment_delete_deduct_page', 1);
+  variable_set('userpoints_nc_comment_delete_deduct_request', 1);
+  variable_set('userpoints_nc_comment_enabled', 1);
+  variable_set('userpoints_nc_comment_enabled_correction', 1);
+  variable_set('userpoints_nc_comment_enabled_forum', 1);
+  variable_set('userpoints_nc_comment_enabled_group', 1);
+  variable_set('userpoints_nc_comment_enabled_image', 1);
+  variable_set('userpoints_nc_comment_enabled_news', 1);
+  variable_set('userpoints_nc_comment_enabled_page', 1);
+  variable_set('userpoints_nc_comment_enabled_request', 1);
+  variable_set('userpoints_nc_comment_ownership_deduct', 1);
+  variable_set('userpoints_nc_comment_ownership_deduct_correction', 1);
+  variable_set('userpoints_nc_comment_ownership_deduct_forum', 1);
+  variable_set('userpoints_nc_comment_ownership_deduct_group', 1);
+  variable_set('userpoints_nc_comment_ownership_deduct_image', 1);
+  variable_set('userpoints_nc_comment_ownership_deduct_news', 1);
+  variable_set('userpoints_nc_comment_ownership_deduct_page', 1);
+  variable_set('userpoints_nc_comment_ownership_deduct_request', 1);
+  variable_set('userpoints_nc_comment_points', '1');
+  variable_set('userpoints_nc_comment_points_correction', '1');
+  variable_set('userpoints_nc_comment_points_forum', '1');
+  variable_set('userpoints_nc_comment_points_group', '1');
+  variable_set('userpoints_nc_comment_points_image', '1');
+  variable_set('userpoints_nc_comment_points_news', '1');
+  variable_set('userpoints_nc_comment_points_page', '1');
+  variable_set('userpoints_nc_comment_points_request', '1');
+  variable_set('userpoints_nc_comment_published_only', 1);
+  variable_set('userpoints_nc_delete_deduct', 1);
+  variable_set('userpoints_nc_delete_deduct_correction', 1);
+  variable_set('userpoints_nc_delete_deduct_forum', 1);
+  variable_set('userpoints_nc_delete_deduct_group', 1);
+  variable_set('userpoints_nc_delete_deduct_image', 1);
+  variable_set('userpoints_nc_delete_deduct_news', 1);
+  variable_set('userpoints_nc_delete_deduct_page', 1);
+  variable_set('userpoints_nc_delete_deduct_request', 1);
+  variable_set('userpoints_nc_enabled', 1);
+  variable_set('userpoints_nc_enabled_correction', 1);
+  variable_set('userpoints_nc_enabled_forum', 1);
+  variable_set('userpoints_nc_enabled_group', 1);
+  variable_set('userpoints_nc_enabled_image', 1);
+  variable_set('userpoints_nc_enabled_news', 1);
+  variable_set('userpoints_nc_enabled_page', 1);
+  variable_set('userpoints_nc_enabled_request', 1);
+  variable_set('userpoints_nc_ownership_deduct', 1);
+  variable_set('userpoints_nc_ownership_deduct_correction', 1);
+  variable_set('userpoints_nc_ownership_deduct_forum', 1);
+  variable_set('userpoints_nc_ownership_deduct_group', 1);
+  variable_set('userpoints_nc_ownership_deduct_image', 1);
+  variable_set('userpoints_nc_ownership_deduct_news', 1);
+  variable_set('userpoints_nc_ownership_deduct_page', 1);
+  variable_set('userpoints_nc_ownership_deduct_request', 1);
+  variable_set('userpoints_nc_points', '100');
+  variable_set('userpoints_nc_points_correction', '5');
+  variable_set('userpoints_nc_points_forum', '5');
+  variable_set('userpoints_nc_points_group', '1');
+  variable_set('userpoints_nc_points_image', '10');
+  variable_set('userpoints_nc_points_news', '100');
+  variable_set('userpoints_nc_points_page', '1');
+  variable_set('userpoints_nc_points_request', '1');
+  variable_set('userpoints_nc_published_only', 1);
+  variable_set('userpoints_nc_revision_category', '0');
+  variable_set('userpoints_nc_revision_category_correction', '0');
+  variable_set('userpoints_nc_revision_category_forum', '0');
+  variable_set('userpoints_nc_revision_category_group', '0');
+  variable_set('userpoints_nc_revision_category_image', '0');
+  variable_set('userpoints_nc_revision_category_news', '0');
+  variable_set('userpoints_nc_revision_category_page', '0');
+  variable_set('userpoints_nc_revision_category_request', '0');
+  variable_set('userpoints_nc_revision_enabled', 1);
+  variable_set('userpoints_nc_revision_enabled_correction', 1);
+  variable_set('userpoints_nc_revision_enabled_forum', 1);
+  variable_set('userpoints_nc_revision_enabled_group', 1);
+  variable_set('userpoints_nc_revision_enabled_image', 1);
+  variable_set('userpoints_nc_revision_enabled_news', 1);
+  variable_set('userpoints_nc_revision_enabled_page', 1);
+  variable_set('userpoints_nc_revision_enabled_request', 1);
+  variable_set('userpoints_nc_revision_own_nodes', 0);
+  variable_set('userpoints_nc_revision_own_nodes_correction', 0);
+  variable_set('userpoints_nc_revision_own_nodes_forum', 0);
+  variable_set('userpoints_nc_revision_own_nodes_group', 0);
+  variable_set('userpoints_nc_revision_own_nodes_image', 0);
+  variable_set('userpoints_nc_revision_own_nodes_news', 0);
+  variable_set('userpoints_nc_revision_own_nodes_page', 0);
+  variable_set('userpoints_nc_revision_own_nodes_request', 0);
+  variable_set('userpoints_nc_revision_points', '5');
+  variable_set('userpoints_nc_revision_points_correction', '1');
+  variable_set('userpoints_nc_revision_points_forum', '0');
+  variable_set('userpoints_nc_revision_points_group', '1');
+  variable_set('userpoints_nc_revision_points_image', '5');
+  variable_set('userpoints_nc_revision_points_news', '5');
+  variable_set('userpoints_nc_revision_points_page', '1');
+  variable_set('userpoints_nc_revision_points_request', '1');
+  variable_set('userpoints_points_moderation', '0');
+  variable_set('userpoints_report_displayzero', '1');
+  variable_set('userpoints_report_limit', '10');
+  variable_set('userpoints_report_usercount', '30');
+  variable_set('userpoints_transaction_timestamp', 1);
+  variable_set('userpoints_trans_lcpoint', 'point');
+  variable_set('userpoints_trans_lcpoints', 'score');
+  variable_set('userpoints_trans_ucpoint', 'Point');
+  variable_set('userpoints_trans_ucpoints', 'Score');
+  variable_set('userpoints_trans_uncat', 'General');
+  variable_set('userpoints_truncate', '30";');
+
+  variable_set('additional_settings__active_tab_correction', 'edit-userpoints-nc-revision');
+  variable_set('additional_settings__active_tab_forum', 'edit-userpoints-nc-revision');
+  variable_set('additional_settings__active_tab_group', 'edit-userpoints-nc-revision');
+  variable_set('additional_settings__active_tab_image', 'edit-userpoints-nc-revision');
+  variable_set('additional_settings__active_tab_page', 'edit-userpoints-nc-revision');
+  variable_set('additional_settings__active_tab_request', 'edit-userpoints-nc-revision');
+  variable_set('settings_additional__active_tab', 'edit-userpoints-nc-comment');
 }
 
 function planetmath_profile_set_misc_variables () {
@@ -1257,16 +1424,18 @@ function planetmath_profile_setup_permissions () {
   return NULL;
 }
 
+// Actually this function doesn't really seem useful or needed for anything
+// since we set up menus with a feature.
 function planetmath_profile_setup_menus () {
   dd("Profile- In planetmath_profile_setup_menus");
   set_time_limit(0);
   // Create a Home link in the main menu.
-  $item = array(
-                'link_title' => st('Home'),
-                'link_path' => '<front>',
-                'menu_name' => 'main-menu',
-                );
-  menu_link_save($item);
+  /* $item = array( */
+  /*               'link_title' => st('Home'), */
+  /*               'link_path' => '<front>', */
+  /*               'menu_name' => 'main-menu', */
+  /*               ); */
+  /* menu_link_save($item); */
 
   // Update the menu router information.
   menu_rebuild();
@@ -1290,18 +1459,31 @@ function planetmath_profile_setup_theme () {
 
   // Disable the default Bartik theme
   theme_disable(array('bartik'));
+
+  // adjust the theme settings to use our logo etc.
+  variable_set('site_slogan', 'Math for the people, by the people.');
+  variable_set('theme_settings', array (
+					'toggle_logo' => 1,
+					'toggle_name' => 1,
+					'toggle_slogan' => 1,
+					'toggle_node_user_picture' => 1,
+					'toggle_comment_user_picture' => 1,
+					'toggle_comment_user_verification' => 1,
+					'toggle_favicon' => 1,
+					'toggle_main_menu' => 1,
+					'toggle_secondary_menu' => 1,
+					'default_logo' => 0,
+					'logo_path' => 'public://alpha.png',
+					'logo_upload' => '',
+					'default_favicon' => 0,
+					'favicon_path' => 'public://planet-alpha_0_0.ico',
+					'favicon_upload' => '',
+					'favicon_mimetype' => 'image/vnd.microsoft.icon',
+					));
+
   return NULL;
 }
 
-// just sample code because I think we'll have to do a lot of database updating
-//function planetmath_profile_sample_database_updating (){
-//  db_update('system')
-//    ->fields(array('status' => 1))
-//    ->condition('type', 'theme')
-//    ->condition('name', 'seven')
-//    ->execute();
-//}
-
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 // Utility functions for the above
 ////////////////////////////////////////////////////////////////////////////////////////////////////