diff --git a/code/CMSBatchAction.php b/code/CMSBatchAction.php
index 0facc18d..8bae8a79 100644
--- a/code/CMSBatchAction.php
+++ b/code/CMSBatchAction.php
@@ -36,7 +36,6 @@ abstract class CMSBatchAction extends Object {
 	 * @param $pages The DataObjectSet of SiteTree objects to perform this batch action
 	 * on.
 	 * @param $helperMethod The method to call on each of those objects.
-	 * @para
 	 */
 	public function batchaction(DataObjectSet $pages, $helperMethod, $successMessage, $arguments = array()) {
 		$failures = 0;
diff --git a/code/CMSMain.php b/code/CMSMain.php
index f748f49e..de021d28 100755
--- a/code/CMSMain.php
+++ b/code/CMSMain.php
@@ -4,8 +4,7 @@
  * This class creates a 2-frame layout - left-tree and right-form - to sit beneath the main
  * admin menu.
  * 
- * @package cms
- * @subpackage content
+ar
  * @todo Create some base classes to contain the generic functionality that will be replicated.
  */
 class CMSMain extends LeftAndMain implements CurrentPageIdentifier, PermissionProvider {
@@ -1429,6 +1428,10 @@ JS;
 	}
 }
 
+/**
+ * @package cms
+ * @subpackage content
+ */
 class CMSMainMarkingFilter {
 	
 	function __construct() {
diff --git a/code/CMSSiteTreeFilter.php b/code/CMSSiteTreeFilter.php
index d6a06609..ed60454e 100644
--- a/code/CMSSiteTreeFilter.php
+++ b/code/CMSSiteTreeFilter.php
@@ -73,6 +73,10 @@ abstract class CMSSiteTreeFilter extends Object {
 
 }
 
+/**
+ * @package cms
+ * @subpackage content
+ */
 class CMSSiteTreeFilter_DeletedPages extends CMSSiteTreeFilter {
 	static function title() {
 		return _t('CMSSiteTreeFilter.DELETEDPAGES', "All pages, including deleted");
@@ -90,6 +94,10 @@ class CMSSiteTreeFilter_DeletedPages extends CMSSiteTreeFilter {
 	}
 }
 
+/**
+ * @package cms
+ * @subpackage content
+ */
 class CMSSiteTreeFilter_ChangedPages extends CMSSiteTreeFilter {
 	static function title() {
 		return _t('CMSSiteTreeFilter.CHANGEDPAGES', "Changed pages");
@@ -100,6 +108,10 @@ class CMSSiteTreeFilter_ChangedPages extends CMSSiteTreeFilter {
 	}	
 }
 
+/**
+ * @package cms
+ * @subpackage content
+ */
 class CMSSiteTreeFilter_Search extends CMSSiteTreeFilter {
 	public $data;
 	
diff --git a/code/HTMLCleaner.php b/code/HTMLCleaner.php
index 9e85e10c..d6ce300b 100644
--- a/code/HTMLCleaner.php
+++ b/code/HTMLCleaner.php
@@ -1,7 +1,9 @@
 <?php
-
 /**
  * Base class for HTML cleaning classes.
+ * 
+ * @package sapphire
+ * @subpackage misc
  */
 abstract class HTMLCleaner  extends Object {
 	/**
diff --git a/code/Report.php b/code/Report.php
index 2adc8ef7..0b4488bf 100644
--- a/code/Report.php
+++ b/code/Report.php
@@ -421,8 +421,10 @@ class SS_Report_FakeQuery extends SQLQuery {
  * 
  * It also makes calls to 2 empty methods that you can override {@link beforeQuery()} and
  * {@link afterQuery()}
+ * 
+ * @package cms
+ * @subpackage reports
  */
-
 abstract class SS_ReportWrapper extends SS_Report {
 	protected $baseReport;
 
diff --git a/code/SecurityAdmin.php b/code/SecurityAdmin.php
index 6756a50e..d94e555b 100644
--- a/code/SecurityAdmin.php
+++ b/code/SecurityAdmin.php
@@ -398,7 +398,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 
 	/**
 	 * Return the entire site tree as a nested set of ULs.
-	 * @return string Unordered list <UL> HTML
+	 * @return string Unordered list HTML
 	 */
 	public function SiteTreeAsUL() {
 		$obj = singleton($this->stat('tree_class'));