diff --git a/admin/hooks/admin-init.php b/admin/hooks/admin-init.php
index 55a94637..848cadb1 100644
--- a/admin/hooks/admin-init.php
+++ b/admin/hooks/admin-init.php
@@ -2,6 +2,7 @@
 function sportspress_admin_init() {
     $post_types = array(
         'sp_event',
+        'sp_calendar',
         'sp_team',
         'sp_table',
         'sp_player',
diff --git a/admin/includes/globals.php b/admin/includes/globals.php
index a7f4ff0e..d9d5758e 100644
--- a/admin/includes/globals.php
+++ b/admin/includes/globals.php
@@ -4,7 +4,7 @@ function sportspress_define_globals() {
 	// Options
 	global $sportspress_options;
 	
-	$sportspress_options = get_option( 'sportspress' );
+	$sportspress_options = (array)get_option( 'sportspress', array() );
 
 	// Continents
 	global $sportspress_continents;
diff --git a/admin/settings/options-general.php b/admin/settings/options-general.php
index 8d49d805..f5d59b65 100644
--- a/admin/settings/options-general.php
+++ b/admin/settings/options-general.php
@@ -52,4 +52,4 @@ class SportsPressGeneralSettingsPage {
 }
 
 if ( is_admin() )
-	$sportspress_event_settings_page = new SportsPressGeneralSettingsPage();
+	$sportspress_general_settings_page = new SportsPressGeneralSettingsPage();
diff --git a/admin/settings/options-player.php b/admin/settings/options-player.php
index 5c3c9baa..91ccb52a 100644
--- a/admin/settings/options-player.php
+++ b/admin/settings/options-player.php
@@ -187,4 +187,4 @@ class SportsPressPlayerSettingsPage {
 }
 
 if ( is_admin() )
-	$sportspress_event_settings_page = new SportsPressPlayerSettingsPage();
+	$sportspress_player_settings_page = new SportsPressPlayerSettingsPage();
diff --git a/admin/settings/options-text.php b/admin/settings/options-text.php
index 61eefcb7..a03ba162 100644
--- a/admin/settings/options-text.php
+++ b/admin/settings/options-text.php
@@ -3,6 +3,7 @@ class SportsPressTextSettingsPage {
 	public function __construct() {
 		global $sportspress_options;
 		$this->options =& $sportspress_options;
+
 		$this->strings = array(
 			array( 'league', __( 'League', 'sportspress' ) ),
 			array( 'season', __( 'Season', 'sportspress' ) ),
@@ -14,9 +15,16 @@ class SportsPressTextSettingsPage {
 			array( 'pos', __( 'Pos', 'sportspress' ) ),
 			array( 'current_team', __( 'Current Team', 'sportspress' ) ),
 		);
+		usort( $this->strings, array( $this, 'compare_label' ) );
+
 		add_action( 'admin_init', array( $this, 'page_init' ), 1 );
 	}
 
+	private function compare_label( $a, $b ) {
+		return strcmp( $a[1], $b[1] );
+	}
+
+
 	function page_init() {
 		register_setting(
 			'sportspress_text',
@@ -25,8 +33,8 @@ class SportsPressTextSettingsPage {
 		);
 		
 		add_settings_section(
-			'string',
-			__( 'Strings', 'sportspress' ),
+			'text',
+			__( 'Text Settings', 'sportspress' ),
 			'',
 			'sportspress_text'
 		);
@@ -35,14 +43,14 @@ class SportsPressTextSettingsPage {
 			add_settings_field(	
 				$string[0],
 				$string[1],
-				array( $this, 'string_callback' ),
+				array( $this, 'text_callback' ),
 				'sportspress_text',
-				'string'
+				'text'
 			);
 		endforeach;
 	}
 
-	public function string_callback( $test ) {
+	public function text_callback( $test ) {
 		$string = array_shift( $this->strings );
 		$key = $string[0];
 		$placeholder = $string[1];
diff --git a/admin/settings/settings.php b/admin/settings/settings.php
index 85dd29e0..b6bfec2e 100644
--- a/admin/settings/settings.php
+++ b/admin/settings/settings.php
@@ -52,7 +52,7 @@ function sportspress_options() {
 
 function sportspress_options_validate( $input ) {
 	
-	$options = (array)get_option( 'sportspress' );
+	$options = (array)get_option( 'sportspress', array() );
 
 	if ( isset( $input['sport'] ) && sportspress_array_value( $options, 'sport', null ) != sportspress_array_value( $input, 'sport', null ) ):