Index: comments.php
===================================================================
--- comments.php	(revision 163)
+++ comments.php	(working copy)
@@ -151,18 +151,15 @@
 
 			<p>Logged in as <a href="<?php echo get_option('siteurl'); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account') ?>">Logout &raquo;</a></p>
 
-			<script language="javascript" type="text/javascript">window.onload = HideUtils;</script>
-
 		<?php } elseif ($comment_author != "") { ?>
 
 			<p><small>Welcome back <strong><?php echo $comment_author; ?></strong>
 			<span id="showinfo">(<a href="javascript:ShowUtils();">Change</a>)</span>
 			<span id="hideinfo">(<a href="javascript:HideUtils();">Close</a>)</span></small></p>
 
-			<script language="javascript" type="text/javascript">window.onload = HideUtils;</script>
-
 		<?php } ?>
-
+		
+		<?php if ( !$user_ID ) { ?>
 			<div id="authorinfo">
 				<p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" />
 				<label for="author"><small><strong>Name</strong> <?php if ($req) _e('(required)'); ?></small></label></p>
@@ -173,6 +170,7 @@
 				<p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
 				<label for="url"><small><strong>Website</strong></small></label></p>
 			</div>
+		<?php } ?>
 		
 			<!--<p><small><strong>XHTML:</strong> You can use these tags: <?php echo allowed_tags(); ?></small></p>-->
 		
Index: js/ajax_comments.js
===================================================================
--- js/ajax_comments.js	(revision 163)
+++ js/ajax_comments.js	(working copy)
@@ -11,9 +11,11 @@
 	Element.show('errors');
 	$('errors').innerHTML = request.responseText;
 	new Effect.Highlight('errors',{queue:'end'});
+	if ($('leavecomment')) { Element.show('leavecomment'); }
 }
 
 function loading() {
+	if ($('leavecomment')) { Element.hide('leavecomment'); }
 	$('submit').disabled = true;
 	$('comment').disabled = true;  
 	Element.show('loading');
@@ -27,4 +29,4 @@
 
 	if (request.status == 200) {commentAdded()}
 	else {failure(request)};
-}
\ No newline at end of file
+}
Index: js/livesearch.js.php
===================================================================
--- js/livesearch.js.php	(revision 163)
+++ js/livesearch.js.php	(working copy)
@@ -1,3 +1,13 @@
+<?php
+	header("Cache-Control: must-revalidate");
+	$offset = 60*60*24*60;
+	$ExpStr = "Expires: ".gmdate("D, d M Y H:i:s",time() + $offset)." GMT";
+	header($ExpStr);
+	header('Content-Type: text/javascript; charset: UTF-8');
+
+	require("../../../../wp-blog-header.php");
+?>
 //  Copyright (c) 2004 Bitflux GmbH                                      
 
 //  Licensed under the Apache License, Version 2.0 (the "License");      
@@ -83,7 +93,7 @@
 	if (t) {
 		window.clearTimeout(t);
 	}
-	t = window.setTimeout("liveSearchDoSearch()",200);
+	t = window.setTimeout("liveSearchDoSearch()",400);
 }
 
 function liveSearchDoSearch() {
@@ -138,4 +148,4 @@
 
 function closeResults() {
     $("LSResult").style.display = "none";
-}
\ No newline at end of file
+}
Index: header.php
===================================================================
--- header.php	(revision 163)
+++ header.php	(working copy)
@@ -18,29 +18,41 @@
 	<link rel="alternate" type="text/xml" title="RSS .92" href="<?php bloginfo('rss_url'); ?>" />
 	<link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="<?php bloginfo('atom_url'); ?>" />
 
-	<?php if (is_single() or is_page()) { ?>
+<?php if (is_single() or is_page()) { ?>
 	<link rel="pingback" href="<?php bloginfo('pingback_url'); ?>" />
-	<?php } ?>
+<?php } ?>
 	
+<?php if ( get_option('k2livesearch') == 0 or get_option('k2livecommenting') == 0 and is_single() or !is_user_logged_in() && $comment_author != $_COOKIE['comment_author_'.COOKIEHASH] ) { ?>
 	<script type="text/javascript" src="<?php bloginfo('template_directory'); ?>/js/prototype.js.php"></script>
 	<script type="text/javascript" src="<?php bloginfo('template_directory'); ?>/js/effects.js.php"></script>
+<?php } ?>
+	
+<?php if(!is_user_logged_in() && is_single() && ($comment_author != $_COOKIE['comment_author_'.COOKIEHASH]) and ('open' == $post-> comment_status) or ('comment' == $post-> comment_type) ) { ?>
 	<script type="text/javascript" src="<?php bloginfo('template_directory'); ?>/js/k2functions.js"></script>
-	
-	<?php /* Load Live Commenting if enabled in the K2 Options Panel and the page is a permalink */ if ((get_option('k2livecommenting') == 0) and (is_single())) { ?>
+<?php } ?>
+
+<?php /* Load Live Commenting if enabled in the K2 Options Panel and the page is a permalink */ if ((get_option('k2livecommenting') == 0) and (is_single() and ('open' == $post-> comment_status) or ('comment' == $post-> comment_type) )) { ?>
 	<script type="text/javascript" src="<?php bloginfo('template_directory'); ?>/js/ajax_comments.js"></script>
-	<?php } ?>
+<?php } ?>
 
-	<?php /* Load LiveSearch if enabled in the K2 Options Panel */ if (get_option('k2livesearch') == 0) { ?>
+<?php /* Load LiveSearch if enabled in the K2 Options Panel */ if (get_option('k2livesearch') == 0) { ?>
+	<script type="text/javascript" src="<?php bloginfo('template_directory'); ?>/js/livesearch.js.php"></script>
 	<script type="text/javascript">//<![CDATA[
-		<?php include_once("js/livesearch.js.php"); ?>
+		window.onload=function() {
+		liveSearchInit();
+		<?php if( !is_user_logged_in() && is_single() && ($comment_author = $_COOKIE['comment_author_'.COOKIEHASH]) and ('open' == $post-> comment_status) or ('comment' == $post-> comment_type) ) { ?>HideUtils();<?php } ?>
 
-		window.onload = liveSearchInit;
+		}
 	//]]></script>
-	<?php } ?>
+<?php } elseif  ( !is_user_logged_in() && is_single() && ($comment_author = $_COOKIE['comment_author_'.COOKIEHASH]) and ('open' == $post-> comment_status) or ('comment' == $post-> comment_type) ) { ?>
+	<script type="text/javascript">//<![CDATA[
+		window.onload=function() {
+		HideUtils();
+		}
+	//]]></script>
+<?php } ?>
 
-
-	<?php trackback_rdf(); ?>
-	<?php wp_get_archives('type=monthly&format=link'); ?>
+<?php wp_get_archives('type=monthly&format=link'); ?>
 	<?php wp_head(); ?>
 
 	<?php /* Sets Matt's asides in motion */ function stupid_hack($str) { return preg_replace('|</ul>s*<ul class="asides">|', '', $str); } ob_start('stupid_hack'); ?>
@@ -64,4 +76,4 @@
 	
 	</div>
 
-		<hr />
\ No newline at end of file
+		<hr />