Index: podpress.php
===================================================================
--- podpress.php	(revision 98367)
+++ podpress.php	(working copy)
@@ -188,7 +188,7 @@
 		add_action('do_feed_rss', 'podPress_do_feed_rss2', 1, 1);
 		add_action('do_feed_rss2', 'podPress_do_feed_rss2', 1, 1);
 		remove_action('do_feed_atom', 'do_feed_atom', 10, 1);
-		add_action('do_feed_atom1', 'podPress_do_feed_atom1', 1, 1);
+		add_action('do_feed_atom', 'podPress_do_feed_atom1', 1, 1);
 
 		if(is_feed()) {
 			podPress_addFeedHooks();
Index: wp-atom1.php
===================================================================
--- wp-atom1.php	(revision 98349)
+++ wp-atom1.php	(working copy)
@@ -6,44 +6,38 @@
 	wp('feed=atom');
 }
 
-header('Content-type: text/xml; charset=' . get_settings('blog_charset'), true);
-//header('Content-type: application/atom+xml; charset=' . get_settings('blog_charset'), true);
+//header('Content-type: text/xml; charset=' . get_settings('blog_charset'), true);
+header('Content-type: application/atom+xml; charset=' . get_settings('blog_charset'), true);
 $more = 1;
-?>
-<?php echo '<?xml version="1.0" encoding="'.get_settings('blog_charset').'"?'.'>'; ?>
+
+echo '<?xml version="1.0" encoding="' . get_settings('blog_charset') . '"?' . '>'; ?>
 <feed
-  xmlns="http://www.w3.org/2005/Atom"
-  xmlns:creativeCommons="http://backend.userland.com/creativeCommonsRssModule"
-  xmlns:dc="http://purl.org/dc/elements/1.1/"
-  xml:lang="<?php echo get_option('rss_language'); ?>"
-  <?php do_action('atom_ns'); ?>
+	xmlns="http://www.w3.org/2005/Atom"
+	xmlns:creativeCommons="http://backend.userland.com/creativeCommonsRssModule"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:thr="http://purl.org/syndication/thread/1.0"
+	xml:lang="<?php echo get_option('rss_language'); ?>"
+	<?php do_action('atom_ns'); ?>
   >
 	<id><?php bloginfo_rss('atom_url') ?></id>
-	<title><?php bloginfo_rss('name') ?></title>
+	<title type="text"><?php bloginfo_rss('name'); wp_title_rss(); ?></title>
 	<link rel="self" type="application/atom+xml" href="<?php bloginfo_rss('atom_url') ?>" />
 	<link rel="alternate" type="application/rss+xml" href="<?php bloginfo_rss('rss2_url') ?>" />
 	<link rel="alternate" type="text/html" hreflang="<?php echo get_option('rss_language'); ?>" href="<?php bloginfo_rss('home') ?>" />
-	<subtitle type="xhtml">	
-		<div xmlns="http://www.w3.org/1999/xhtml">
-			<strong><?php bloginfo_rss('description') ?></strong><br /><br />
-			Insert more <strong>info</strong> about your blog here.
-		</div>
-	</subtitle>
-	
-	<updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('gmt'), false); ?></updated>
+	<subtitle type="text"><?php bloginfo_rss("description") ?></subtitle>
+	<updated><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT')); ?></updated>
 	<rights>Copyright <?php echo mysql2date('Y', get_lastpostdate('gmt'), false); ?> <?php bloginfo_rss('name') ?></rights>
 	<creativeCommons:license>http://creativecommons.org/licenses/by-nc-sa/2.5/</creativeCommons:license>
 	<generator uri="http://wordpress.org/" version="<?php bloginfo_rss('version'); ?>">WordPress</generator>
-
 	<author>
-		<name><?php bloginfo_rss('name') ?></name>
+		<name><?php bloginfo_rss('name'); ?></name>
 		<uri><?php bloginfo_rss('siteurl'); ?></uri>
 	</author>
 	<?php do_action('atom_head'); ?>
 	<?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?>
 	<entry>
 		<id><?php the_guid(); ?></id>
-		<title type="html"><?php the_title_rss() ?></title>
+		<title type="<?php html_type_rss(); ?>"><![CDATA[<?php the_title_rss() ?>]]></title>
 		<link rel="alternate" type="text/html" hreflang="<?php echo get_option('rss_language'); ?>" href="<?php permalink_single_rss() ?>" />
 		<link rel="related" type="application/rss+xml" href="<?php echo comments_rss(); ?>" />
 		<author>
@@ -55,20 +49,12 @@
 		<?php the_category_rss('rdf') ?>
 		<rights>Copyright <?php echo get_post_time('Y', true); ?> <?php the_author() ?></rights>
 		<creativeCommons:license>http://creativecommons.org/licenses/by-nc-sa/2.5/</creativeCommons:license>
-		<summary type="xhtml">
-			<div xmlns="http://www.w3.org/1999/xhtml">
-				<?php the_excerpt_rss(); ?>
-				<br /><br />
-				(<a href="<?php comments_link(); ?>">Comments</a>)
-			</div>
+		<summary type="<?php html_type_rss(); ?>">
+				<![CDATA[<?php the_excerpt_rss(); ?><br /><br />(<a href="<?php comments_link(); ?>"><?php echo __('Comments');?></a>)]]>
 		</summary>
 	<?php if ( !get_settings('rss_use_excerpt') ) : ?>
-		<content type="xhtml">
-			<div xmlns="http://www.w3.org/1999/xhtml">
-				<?php the_content('', 0, '') ?>
-				<br /><br />
-				(<a href="<?php comments_link(); ?>">Comments</a>)
-			</div>
+		<content type="<?php html_type_rss(); ?>" xml:base="<?php the_permalink_rss() ?>">
+				<![CDATA[<?php the_content('', 0, '') ?><br /><br />(<a href="<?php comments_link(); ?>"><?php echo __('Comments');?></a>)]]>
 		</content>
 	<?php endif; ?>
 	<?php rss_enclosure(); ?>