Index: branches/1.2.x/units/widgets/widget_tp.php
===================================================================
diff -u -N -r15342 -r16514
--- branches/1.2.x/units/widgets/widget_tp.php	(.../widget_tp.php)	(revision 15342)
+++ branches/1.2.x/units/widgets/widget_tp.php	(.../widget_tp.php)	(revision 16514)
@@ -26,8 +26,8 @@
 	 */
 	function ItemEditLink($params)
 	{
+		/** @var kDBList $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBList */
 
 		$edit_template = $this->Application->getUnitOption($this->Prefix, 'AdminTemplatePath') . '/' . $this->Application->getUnitOption($this->Prefix, 'AdminTemplatePrefix') . 'edit';
 
@@ -53,8 +53,8 @@
 	 */
 	protected function ItemLink($params)
 	{
+		/** @var kDBItem $object */
 		$object = $this->getObject($params);
-		/* @var $object kDBItem */
 
 		$params['pass'] = 'm,' . $this->Prefix;
 		$params[$object->Prefix . '_id'] = $object->GetID();
Index: branches/1.2.x/units/sections/users/e_user_eh.php
===================================================================
diff -u -N -r15146 -r16514
--- branches/1.2.x/units/sections/users/e_user_eh.php	(.../e_user_eh.php)	(revision 15146)
+++ branches/1.2.x/units/sections/users/e_user_eh.php	(.../e_user_eh.php)	(revision 16514)
@@ -81,8 +81,8 @@
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			# identifying event based on special and setting filter
 			if ( $event->Special == 'custom-special' ) {
Index: branches/1.2.x/units/sections/products/e_product_eh.php
===================================================================
diff -u -N -r15146 -r16514
--- branches/1.2.x/units/sections/products/e_product_eh.php	(.../e_product_eh.php)	(revision 15146)
+++ branches/1.2.x/units/sections/products/e_product_eh.php	(.../e_product_eh.php)	(revision 16514)
@@ -82,8 +82,8 @@
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			# identifying event based on special and setting filter
 			if ( $event->Special == 'custom-special' ) {
Index: branches/1.2.x/units/sections/users/e_user_tp.php
===================================================================
diff -u -N -r15153 -r16514
--- branches/1.2.x/units/sections/users/e_user_tp.php	(.../e_user_tp.php)	(revision 15153)
+++ branches/1.2.x/units/sections/users/e_user_tp.php	(.../e_user_tp.php)	(revision 16514)
@@ -16,8 +16,8 @@
 		 */
 		function PrintFormattedUserAddress($params)
 		{
+			/** @var kDBItem $object */
 			$object = $this->getObject($params);
-			/* @var $object kDBItem */
 
 			$ret = '';
 			$newline = '<br/>';
Index: branches/1.2.x/units/sections/categories/e_category_eh.php
===================================================================
diff -u -N -r15146 -r16514
--- branches/1.2.x/units/sections/categories/e_category_eh.php	(.../e_category_eh.php)	(revision 15146)
+++ branches/1.2.x/units/sections/categories/e_category_eh.php	(.../e_category_eh.php)	(revision 16514)
@@ -81,8 +81,8 @@
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			# identifying event based on special and setting filter
 			if ( $event->Special == 'custom-special' ) {
Index: branches/1.2.x/install.php
===================================================================
diff -u -N -r16485 -r16514
--- branches/1.2.x/install.php	(.../install.php)	(revision 16485)
+++ branches/1.2.x/install.php	(.../install.php)	(revision 16514)
@@ -20,8 +20,8 @@
 }
 else {
 	// install, using installation wizard
+	/** @var kInstallToolkit $toolkit */
 	$toolkit =& $this->toolkit;
-	/* @var $toolkit kInstallToolkit */
 }
 
 $application =& kApplication::Instance();
Index: branches/1.2.x/units/sections/links/e_link_eh.php
===================================================================
diff -u -N -r15146 -r16514
--- branches/1.2.x/units/sections/links/e_link_eh.php	(.../e_link_eh.php)	(revision 15146)
+++ branches/1.2.x/units/sections/links/e_link_eh.php	(.../e_link_eh.php)	(revision 16514)
@@ -81,8 +81,8 @@
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			# identifying event based on special and setting filter
 			if ( $event->Special == 'custom-special' ) {
Index: branches/1.2.x/units/sections/articles/e_article_eh.php
===================================================================
diff -u -N -r15146 -r16514
--- branches/1.2.x/units/sections/articles/e_article_eh.php	(.../e_article_eh.php)	(revision 15146)
+++ branches/1.2.x/units/sections/articles/e_article_eh.php	(.../e_article_eh.php)	(revision 16514)
@@ -81,8 +81,8 @@
 		{
 			parent::SetCustomQuery($event);
 
+			/** @var kDBList $object */
 			$object = $event->getObject();
-			/* @var $object kDBList */
 
 			# identifying event based on special and setting filter
 			if ( $event->Special == 'custom-special' ) {
Index: branches/1.2.x/units/widgets/widget_eh.php
===================================================================
diff -u -N -r16265 -r16514
--- branches/1.2.x/units/widgets/widget_eh.php	(.../widget_eh.php)	(revision 16265)
+++ branches/1.2.x/units/widgets/widget_eh.php	(.../widget_eh.php)	(revision 16514)
@@ -111,8 +111,8 @@
 	 */
 	function OnCustomEvent($event)
 	{
+		/** @var kDBList $object */
 		$object = $event->getObject();
-		/* @var $object kDBList */
 
 	}
 
@@ -128,8 +128,8 @@
 	{
 		parent::SetCustomQuery($event);
 
+		/** @var kDBList $object */
 		$object = $event->getObject();
-		/* @var $object kDBList */
 
 		# identifying event based on special and setting filter
 		if ( $event->Special == 'custom-special' ) {
@@ -293,8 +293,8 @@
 			$params['pass_template'] = false;
 		}
 
+		/** @var kRewriteUrlProcessor $rewrite_processor */
 		$rewrite_processor = $this->Application->recallObject('kRewriteUrlProcessor');
-		/* @var $rewrite_processor kRewriteUrlProcessor */
 
 		$processed_params = $rewrite_processor->getProcessedParams($prefix, $params, $keep_events);
 
@@ -348,8 +348,8 @@
 			$widget_filename = $url_parts[$widget_index + 1];
 		}
 
+		/** @var kRewriteUrlProcessor $rewrite_processor */
 		$rewrite_processor = $this->Application->recallObject('kRewriteUrlProcessor');
-		/* @var $rewrite_processor kRewriteUrlProcessor */
 
 		if ( $widget_filename ) {
 			$sql = 'SELECT WidgetId