diff --git a/gradebook/gradebook.class.php b/gradebook/gradebook.class.php
index 1ccf056..e388caf 100644
--- a/gradebook/gradebook.class.php
+++ b/gradebook/gradebook.class.php
@@ -267,9 +267,9 @@ function load_grades( $gradebook_id, $parse = false ) {
     }
     
     /**
-     * load_grades_by_user_id( $assignment, $user_id )
+     * load_grade_by_user_id( $assignment, $user_id )
      *
-     * Loads all the grades for a given assignment by user id
+     * Loads all the grade for a given assignment by user id
      *
      * @param Int $assignment the ID of the assignment gradeboodk to load
      * @param Int $user_id, the id of the user
diff --git a/groups/templates/single_assignment.php b/groups/templates/single_assignment.php
index 5f4e6dd..b96940d 100644
--- a/groups/templates/single_assignment.php
+++ b/groups/templates/single_assignment.php
@@ -10,16 +10,24 @@
             </li>
             <?php endif; ?>
             <?php if( isset( $user_grade ) ): ?>
-            <li id="assignment-grade">
-                <?php _e( 'Your Grade:', 'bpsp' ); ?>
-                <strong>
-                    <?php if( !empty( $user_grade['format'] ) && 'percentage' == $user_grade['format'] ): ?>
-                    <?php echo $user_grade['value']; ?>%
-                    <?php else: ?>
-                    <?php echo $user_grade['value']; ?>
-                    <?php endif; ?>
-                </strong>
-            </li>
+                <li id="assignment-grade">
+                    <?php _e( 'Your Grade:', 'bpsp' ); ?>
+                    <strong>
+                        <?php if( !empty( $user_grade['format'] ) && 'percentage' == $user_grade['format'] ): ?>
+                        <?php echo $user_grade['value']; ?>%
+                        <?php else: ?>
+                        <?php echo $user_grade['value']; ?>
+                        <?php endif; ?>
+                    </strong>
+                </li>
+                <?php if ( !empty( $user_grade['pub_comment'] ) ): ?>
+                <li id="assignment-comment">
+                    <?php _e( 'Teacher Comment:', 'bpsp' ); ?>
+                    <strong>
+                        <?php echo $user_grade['pub_comment']; ?>
+                    </strong>
+                </li>
+                <?php endif; ?>
             <?php endif; ?>
             <li class="date">
             <?php
@@ -140,4 +148,4 @@
     bpsp_partial( $templates_path, '_responses', get_defined_vars() );
     // Load bibs
     bpsp_partial( $templates_path, '_bibs', get_defined_vars() );
-?>
\ No newline at end of file
+?>