diff --git a/core/imageboard.pack.php b/core/imageboard.pack.php
index b21cbf6a..71b57191 100644
--- a/core/imageboard.pack.php
+++ b/core/imageboard.pack.php
@@ -59,9 +59,19 @@ class Image {
 	/** @var string[]|null */
 	public $tag_array;
 
-	public $owner_id, $owner_ip;
+	/** @var int */
+	public $owner_id;
+	
+	/** @var string */
+	public $owner_ip;
+	
+	/** @var string */
 	public $posted;
+	
+	/** @var string */
 	public $source;
+    
+	/** @var boolean */
 	public $locked;
 
 	/**
diff --git a/core/user.class.php b/core/user.class.php
index 3e375a8d..e2b30a1d 100644
--- a/core/user.class.php
+++ b/core/user.class.php
@@ -1,6 +1,10 @@
 <?php
 
-/** @private */
+/**
+ * @private
+ * @param mixed $row
+ * @return User
+ */
 function _new_user($row) {
 	return new User($row);
 }
diff --git a/ext/ext_manager/main.php b/ext/ext_manager/main.php
index e92eea96..9f6045c6 100644
--- a/ext/ext_manager/main.php
+++ b/ext/ext_manager/main.php
@@ -12,7 +12,10 @@
  *   extensions and read their documentation
  */
 
-/** @private */
+/**
+ * @private
+ * @return int
+ */
 function __extman_extcmp(ExtensionInfo $a, ExtensionInfo $b) {
 	return strcmp($a->name, $b->name);
 }
@@ -189,6 +192,9 @@ class ExtManager extends Extension {
 		$this->write_config($extras);
 	}
 
+    /**
+     * @param string[] $extra
+     */
 	private function write_config($extras) {
 		file_put_contents(
 			"data/config/extensions.conf.php",
diff --git a/ext/index/main.php b/ext/index/main.php
index 24fe3f5b..5d09218b 100644
--- a/ext/index/main.php
+++ b/ext/index/main.php
@@ -225,6 +225,7 @@ class PostListBuildingEvent extends Event {
 }
 
 class Index extends Extension {
+    /** @var int */
 	private $stpen = 0;  // search term parse event number
 
 	public function onInitExt(InitExtEvent $event) {
diff --git a/ext/upgrade/main.php b/ext/upgrade/main.php
index ce92cd6b..8f4b7dc5 100644
--- a/ext/upgrade/main.php
+++ b/ext/upgrade/main.php
@@ -129,6 +129,7 @@ class Upgrade extends Extension {
 		}
 	}
 
+    /** @return int */
 	public function get_priority() {return 5;}
 }
 
diff --git a/ext/word_filter/main.php b/ext/word_filter/main.php
index f9cbf21e..9a12b4fa 100644
--- a/ext/word_filter/main.php
+++ b/ext/word_filter/main.php
@@ -43,6 +43,9 @@ class WordFilter extends Extension {
 		return $text;
 	}
 
+	/**
+	 * @return string[]
+	 */
 	private function get_map() {
 		global $config;
 		$raw = $config->get_string("word_filter");