wordpress.tv/public_html/wp-content/themes/wptv2/archive.php       | 1 +
 wordpress.tv/public_html/wp-content/themes/wptv2/breadcrumbs.php   | 1 +
 .../public_html/wp-content/themes/wptv2/category-wordcamptv.php    | 1 +
 wordpress.tv/public_html/wp-content/themes/wptv2/category.php      | 1 +
 wordpress.tv/public_html/wp-content/themes/wptv2/functions.php     | 1 +
 wordpress.tv/public_html/wp-content/themes/wptv2/index.php         | 1 +
 wordpress.tv/public_html/wp-content/themes/wptv2/search.php        | 3 +++
 .../public_html/wp-content/themes/wptv2/sidebar-single.php         | 7 ++++++-
 wordpress.tv/public_html/wp-content/themes/wptv2/single.php        | 1 +
 9 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/wordpress.tv/public_html/wp-content/themes/wptv2/archive.php b/wordpress.tv/public_html/wp-content/themes/wptv2/archive.php
index a16cc90..cac0642 100644
--- a/wordpress.tv/public_html/wp-content/themes/wptv2/archive.php
+++ b/wordpress.tv/public_html/wp-content/themes/wptv2/archive.php
@@ -3,6 +3,7 @@
  * WordCamp.tv Archives
  *
  * Yearly, monthly, daily, author and whatever falls back to archive.php.
+ * @global $wp_query, $post, $wptv
  */
 
 get_header();
diff --git a/wordpress.tv/public_html/wp-content/themes/wptv2/breadcrumbs.php b/wordpress.tv/public_html/wp-content/themes/wptv2/breadcrumbs.php
index 93b3dfc..f4855af 100644
--- a/wordpress.tv/public_html/wp-content/themes/wptv2/breadcrumbs.php
+++ b/wordpress.tv/public_html/wp-content/themes/wptv2/breadcrumbs.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Breadcrumbs template part, use with get_template_part()
+ * @global $wptv
  */
 
 global $wptv;
diff --git a/wordpress.tv/public_html/wp-content/themes/wptv2/category-wordcamptv.php b/wordpress.tv/public_html/wp-content/themes/wptv2/category-wordcamptv.php
index 3bf5775..8f00604 100644
--- a/wordpress.tv/public_html/wp-content/themes/wptv2/category-wordcamptv.php
+++ b/wordpress.tv/public_html/wp-content/themes/wptv2/category-wordcamptv.php
@@ -3,6 +3,7 @@
  * WordCampTV Category Archives
  *
  * Requires a special display, hence the template.
+ * @global $wptv
  */
 
 $featured = new WP_Query( array(
diff --git a/wordpress.tv/public_html/wp-content/themes/wptv2/category.php b/wordpress.tv/public_html/wp-content/themes/wptv2/category.php
index 3933df8..efdeb4b 100644
--- a/wordpress.tv/public_html/wp-content/themes/wptv2/category.php
+++ b/wordpress.tv/public_html/wp-content/themes/wptv2/category.php
@@ -4,6 +4,7 @@
  *
  * Used for categories display, especially the to-do category.
  * Fallback to others as well.
+ * @global $wp_query, $wptv
  */
 
 global $wp_query, $wptv;
diff --git a/wordpress.tv/public_html/wp-content/themes/wptv2/functions.php b/wordpress.tv/public_html/wp-content/themes/wptv2/functions.php
index 5323a78..fc62859 100644
--- a/wordpress.tv/public_html/wp-content/themes/wptv2/functions.php
+++ b/wordpress.tv/public_html/wp-content/themes/wptv2/functions.php
@@ -44,6 +44,7 @@ class WordPressTV_Theme {
 
 	/**
 	 * Different posts_per_page settings for different views. Runs during pre_get_posts.
+         * @param WP_Query $query
 	 */
 	function posts_per_page( $query ) {
 		$posts_per_page = $query->get( 'posts_per_page' );
diff --git a/wordpress.tv/public_html/wp-content/themes/wptv2/index.php b/wordpress.tv/public_html/wp-content/themes/wptv2/index.php
index cf6a863..6d53748 100644
--- a/wordpress.tv/public_html/wp-content/themes/wptv2/index.php
+++ b/wordpress.tv/public_html/wp-content/themes/wptv2/index.php
@@ -3,6 +3,7 @@
  * WordCamp.tv Index Fallback
  *
  * It will be weird if somebody sees this (but okay if 404)
+ * @global $wp_query, $post, $wptv
  */
 
 get_header();
diff --git a/wordpress.tv/public_html/wp-content/themes/wptv2/search.php b/wordpress.tv/public_html/wp-content/themes/wptv2/search.php
index 8b8fce4..f70e00f 100644
--- a/wordpress.tv/public_html/wp-content/themes/wptv2/search.php
+++ b/wordpress.tv/public_html/wp-content/themes/wptv2/search.php
@@ -1,4 +1,7 @@
 <?php
+/*
+ * @global $wp_query
+ */
 global $wp_query;
 
 // See improved improved (yes, improved twice) search.
diff --git a/wordpress.tv/public_html/wp-content/themes/wptv2/sidebar-single.php b/wordpress.tv/public_html/wp-content/themes/wptv2/sidebar-single.php
index 7d3e04f..dfaf456 100644
--- a/wordpress.tv/public_html/wp-content/themes/wptv2/sidebar-single.php
+++ b/wordpress.tv/public_html/wp-content/themes/wptv2/sidebar-single.php
@@ -1,4 +1,9 @@
-<?php global $wptv, $originalcontent; ?>
+<?php 
+/*
+ * @global $wptv, $originalcontent
+ */
+global $wptv, $originalcontent; 
+?>
 
 <div class="secondary-content video-info">
 	<h5>Published</h5>
diff --git a/wordpress.tv/public_html/wp-content/themes/wptv2/single.php b/wordpress.tv/public_html/wp-content/themes/wptv2/single.php
index 021416d..81c7568 100644
--- a/wordpress.tv/public_html/wp-content/themes/wptv2/single.php
+++ b/wordpress.tv/public_html/wp-content/themes/wptv2/single.php
@@ -1,6 +1,7 @@
 <?php
 /**
  * Single Video Template
+ * @global $wptv, $originalcontent
  */
 global $wptv, $originalcontent;
 get_header(); the_post();