diff --git a/ceo-core.php b/ceo-core.php
index 640b72e..b489857 100644
--- a/ceo-core.php
+++ b/ceo-core.php
@@ -39,6 +39,9 @@ function ceo_add_menu_pages() {
 			case 'comiceasel-upload':
 				add_action('admin_print_styles-' . $upload_hook, 'ceo_load_styles_upload');
 				add_action('admin_print_styles-' . $upload_hook, 'ceo_load_scripts_upload');
+				add_thickbox();
+				wp_admin_css();
+				wp_tiny_mce();
 		}
 	}
 }
@@ -57,17 +60,20 @@ function ceo_load_styles_image_manager() {
 	wp_enqueue_style('comiceasel-fileuploader-style', ceo_pluginfo('plugin_url') .'/css/fileuploader.css');
 }
 
-/*    <script type="text/javascript" src="<?php echo $plugin_url_root ?>/jscalendar-1.0/calendar.js"></script>
-//    <script type="text/javascript" src="<?php echo $plugin_url_root ?>/jscalendar-1.0/lang/calendar-en.js"></script>
-//    <script type="text/javascript" src="<?php echo $plugin_url_root ?>/jscalendar-1.0/calendar-setup.js"></script> */
-	
 function ceo_load_scripts_upload() {
+	wp_enqueue_script('common');
+	wp_enqueue_script('jquery-color');
+	wp_enqueue_script('editor');
+	wp_enqueue_script('media-upload');
+	wp_enqueue_script('utils');
+	wp_enqueue_script('word-count');
 	wp_enqueue_script('comiceasel-upload-calendar', ceo_pluginfo('plugin_url') . '/js/jscalendar-1.0/calendar.js');
 	wp_enqueue_script('comiceasel-upload-calendar-en', ceo_pluginfo('plugin_url') . '/js/jscalendar-1.0/lang/calendar-en.js');
 	wp_enqueue_script('comiceasel-upload-calendar-setup', ceo_pluginfo('plugin_url') . '/js/jscalendar-1.0/calendar-setup.js');	
 }
 
 function ceo_load_styles_upload() {
+	wp_enqueue_style('comiceasel_css', ceo_pluginfo('plugin_url') . '/css/comiceasel.css');
 	wp_enqueue_style('comiceasel-upload-calendar-blue', ceo_pluginfo('plugin_url') . '/js/jscalendar-1.0/calendar-blue.css');
 }
 
diff --git a/ceo-upload.php b/ceo-upload.php
index c6e0507..3f9c7cb 100644
--- a/ceo-upload.php
+++ b/ceo-upload.php
@@ -8,14 +8,14 @@
 	</tr>
 </thead>
 <tr><td>Post Title <span style="color: #f00;font-size: 11px;">(Required)</span>:</td><td><input size="80" type="text" name="title" value="New Comic"></td></tr>
-<tr><td>Content:</td><td><textarea type="test" name="content" style="height: 80px; width: 440px;" value=""></textarea></td></tr>
+<tr><td colspan="3"><?php $content=''; the_editor($content, 'Content'); ?></td></tr>
 <tr>
 	<td>Publish Date <span style="color: #f00;font-size: 11px;">(Required)</span>:</td>
-	<td><input type="text" id="override-date" name="override-date" value="yyyy-mm-dd"></td>
+	<td><input type="text" id="override-date" name="override-date" value="yyyy-mm-dd"><br /><span class="infotext">Click inside box to open calendar.</span></td>
 </tr>
 <tr>
 	<td>Time:</td>
-	<td><input type="text" id="override-time" name="override-time" value="hh:mm:ss"></td>
+	<td><input type="text" id="override-time" name="override-time" value="00:01"><br /><span class="infotext">One second after midnight.</span></td>
 </tr>
 
 
diff --git a/comiceasel.php b/comiceasel.php
index 15f922a..d42b55f 100644
--- a/comiceasel.php
+++ b/comiceasel.php
@@ -25,15 +25,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 */
 
-define( 'CEASEL_PLUGINPATH', trailingslashit(home_url())  . trailingslashit(ceo_get_plugin_path()) );
-
 add_action('init', 'ceo_initialize_post_types');
 
 function ceo_initialize_post_types() {
 	$labels = array(
-			'name' => _x('Comic Easel', 'post type general name'),
-			'singular_name' => _x('Comic', 'post type singular name'),
-			'add_new' => _x('Add Comic Post', 'comic'),
+			'name' => __('Comic Easel', 'comiceasel'),
+			'singular_name' => __('Comic', 'comiceasel'),
+			'add_new' => __('Add Comic', 'comiceasel'),
 			'add_new_item' => __('Add Comic Post'),
 			'edit_item' => _x('Edit Comic','comic'),
 			'edit' => _x('Edit', 'comic'),
@@ -59,8 +57,9 @@ function ceo_initialize_post_types() {
 				'rewrite' => true,
 				'hierarchical' => false,
 				'menu_position' => 5,
-				'menu_icon' => CEASEL_PLUGINPATH . 'images/ceo-icon.png',
-				'supports' => array( 'title', 'editor', 'excerpt', 'author', 'comments', 'thumbnail', 'custom-fields' )
+				'menu_icon' => ceo_pluginfo('plugin_url') . '/images/ceo-icon.png',
+				'supports' => array( 'title', 'editor', 'excerpt', 'author', 'comments', 'thumbnail', 'custom-fields' ),
+				'description' => 'Post type for Comics'
 				));
 
 	$labels = array(
diff --git a/css/comiceasel.css b/css/comiceasel.css
index 6b3f55d..06e9b47 100644
--- a/css/comiceasel.css
+++ b/css/comiceasel.css
@@ -15,4 +15,10 @@ Defaults for the Comic Easel Elements.
 	.default-nav-base {
 		display: inline-block;
 		padding: 0 10px;
-	}
\ No newline at end of file
+	}
+	
+.infotext {
+	font-size: 10px;
+	color: gray;
+	padding-left: 5px;
+}
\ No newline at end of file