diff --git a/e107_core/shortcodes/batch/comment_shortcodes.php b/e107_core/shortcodes/batch/comment_shortcodes.php
index 344b324dc..7a25a510c 100644
--- a/e107_core/shortcodes/batch/comment_shortcodes.php
+++ b/e107_core/shortcodes/batch/comment_shortcodes.php
@@ -133,7 +133,8 @@ SC_END
 
 SC_BEGIN LEVEL
 global $LEVEL, $comrow, $pref;
-$ldata = get_level($comrow['user_id'], $comrow['user_forums'], $comrow['user_comments'], $comrow['user_chats'], $comrow['user_visits'], $comrow['user_join'], $comrow['user_admin'], $comrow['user_perms'], $pref);
+//FIXME - new level handler, currently commented to avoid parse errors
+//$ldata = get_level($comrow['user_id'], $comrow['user_forums'], $comrow['user_comments'], $comrow['user_chats'], $comrow['user_visits'], $comrow['user_join'], $comrow['user_admin'], $comrow['user_perms'], $pref);
 return ($comrow['user_admin'] ? $ldata[0] : $ldata[1]);
 SC_END
 
diff --git a/e107_core/shortcodes/batch/user_shortcodes.php b/e107_core/shortcodes/batch/user_shortcodes.php
index 12aeef45f..2f38d0693 100644
--- a/e107_core/shortcodes/batch/user_shortcodes.php
+++ b/e107_core/shortcodes/batch/user_shortcodes.php
@@ -110,9 +110,10 @@ SC_END
 
 SC_BEGIN USER_LEVEL
 global $user, $pref;
-require_once(e_HANDLER."level_handler.php");
-$ldata = get_level($user['user_id'], $user['user_forums'], $user['user_comments'], $user['user_chats'], $user['user_visits'], $user['user_join'], $user['user_admin'], $user['user_perms'], $pref);
-
+//FIXME - new level handler, currently commented to avoid parse errors
+//require_once(e_HANDLER."level_handler.php");
+//$ldata = get_level($user['user_id'], $user['user_forums'], $user['user_comments'], $user['user_chats'], $user['user_visits'], $user['user_join'], $user['user_admin'], $user['user_perms'], $pref);
+$ldata = array();
 if (strstr($ldata[0], "IMAGE_rank_main_admin_image")) 
 {
 	return LAN_USER_31;
diff --git a/e107_handlers/comment_class.php b/e107_handlers/comment_class.php
index 18d66b6ab..3d98d8e0b 100644
--- a/e107_handlers/comment_class.php
+++ b/e107_handlers/comment_class.php
@@ -211,7 +211,8 @@ class comment
 				$rater = new rater;
 			}
 		}
-		require_once (e_HANDLER."level_handler.php");
+		//FIXME - new level handler, currently commented to avoid parse errors
+		//require_once (e_HANDLER."level_handler.php");
 		if (!$width)
 		{
 			$width = 0;
diff --git a/e107_handlers/news_class.php b/e107_handlers/news_class.php
index 970f4f44e..5b2d14363 100644
--- a/e107_handlers/news_class.php
+++ b/e107_handlers/news_class.php
@@ -2,18 +2,31 @@
 /*
  * e107 website system
  *
- * Copyright (C) 2008-2009 e107 Inc (e107.org)
+ * Copyright (C) 2008-2010 e107 Inc (e107.org)
  * Released under the terms and conditions of the
  * GNU General Public License (http://www.gnu.org/licenses/gpl.txt)
  *
  * News handler
  *
- * $Source: /cvs_backup/e107_0.8/e107_handlers/news_class.php,v $
- * $Revision$
- * $Date$
- * $Author$
+ * $URL$
+ * $Id$
 */
 
+/**
+ *
+ * @package     e107
+ * @subpackage	e107_handlers
+ * @version     $Id$
+ * @author      e107inc
+ *
+ * Classes:
+ * news - old news class
+ * e_news_item - news data model - the future
+ * e_news_tree - news items collection
+ * e_news_category_item - news category data model
+ * e_news_category_tree - news category items collection
+ */
+
 if (!defined('e107_INIT')) { exit; }
 
 class news {