diff --git a/src/Testify/framework/reporting/CoverageReporter.php b/src/Testify/framework/reporting/CoverageReporter.php
index 5e4c312..91b29cc 100644
--- a/src/Testify/framework/reporting/CoverageReporter.php
+++ b/src/Testify/framework/reporting/CoverageReporter.php
@@ -28,13 +28,12 @@
 						'cloc' => 0
 					)
 				);
+				
 				foreach ($data as $line => $unitsCovered) {
 					$loc  = 1;
 					$dloc = ($unitsCovered === self::DEAD) ? 1 : 0;
 					$cloc = ($unitsCovered > 0)            ? 1 : 0;
 					
-					
-					
 					//find the class this line resides in, if any
 					$class = null;
 					foreach ($refClasses as $refClass) {
@@ -109,7 +108,7 @@
 			fwrite(STDOUT, "Totals:\n");
 			fwrite(STDOUT, "  Covered:    $totcloc\n");
 			fwrite(STDOUT, "  Dead:       $totdloc\n");
-			fwrite(STDOUT, "  Executable: " . ($totloc - $totdloc) . " (" . round($totcloc / ($totloc - $dloc) * 100, 2) . "%)\n");
+			fwrite(STDOUT, "  Executable: " . ($totloc - $totdloc) . " (" . round($totcloc / ($totloc - $totdloc) * 100, 2) . "%)\n");
 		}
 		
 		public static function createHtmlReport($coverageDir, array $coverageData, $renderer = null) {
@@ -150,14 +149,13 @@
 		
 		private static function writeHtmlFile($sourceFile, $baseDir, $coverageDir, array $classData, array $coverageData, $renderer) {
 			//summary view
-			$fileCoverage = '';
+			$fileCoverage  = '';
 			$classCoverage = '';
 			
-			$tloc  = 0;
-			$tdloc = 0;
-			$tcloc = 0;
+			$tloc          = 0;
+			$tdloc         = 0;
+			$tcloc         = 0;
 			foreach ($classData['classes'] as $class => $methods) {
-				$classCoverage = '';
 				$classLoc  = 0;
 				$classDloc = 0;
 				$classCloc = 0;
@@ -177,7 +175,7 @@
 					
 					$percentageData = self::getPercentage($methodData['cloc'], $methodData['loc'] - $methodData['dloc']);
 					
-					$methodCoverage .= "<tr class=\"method-coverage\"><th>&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"#line-$methodStartLine\">$methodDeclaration</a></th>";
+					$methodCoverage .= "<tr class=\"coverage-method\"><th>&nbsp;&nbsp;&nbsp;&nbsp;<a href=\"#line-$methodStartLine\" title=\"$class::$method() (line $methodStartLine)\">$methodDeclaration</a></th>";
 					$methodCoverage .= "<td class=\"coverage-ratio\" style=\"background-color: $percentageData[1]\">$methodData[cloc] / " . ($methodData['loc'] - $methodData['dloc']) . "</td>";
 					$methodCoverage .= "<td class=\"coverage-percentage\" style=\"background-color: $percentageData[1]\">$percentageData[0]%</td></tr>\n";
 					if ($renderer !== null) {
@@ -191,7 +189,7 @@
 				
 				$classStartLine = $refClass->getStartLine();
 				$percentageData = self::getPercentage($classCloc, $classLoc - $classDloc);
-				$classCoverage .= "<tr class=\"class-coverage\"><th>&nbsp;&nbsp;<a href=\"#line-$classStartLine\">$class</a></th>";
+				$classCoverage .= "<tr class=\"coverage-class\"><th>&nbsp;&nbsp;<a href=\"#line-$classStartLine\" title=\"$class (line $classStartLine)\">$class</a></th>";
 				$classCoverage .= "<td class=\"coverage-ratio\" style=\"background-color: $percentageData[1]\">$classCloc / " . ($classLoc - $classDloc) . "</td>";
 				$classCoverage .= "<td class=\"coverage-percentage\" style=\"background-color: $percentageData[1]\">$percentageData[0]%</td></tr>\n";
 				if ($renderer !== null) {
@@ -200,12 +198,12 @@
 				$classCoverage .= $methodCoverage;
 			}
 			
-			$tloc += $classData['procedural']['loc'];
+			$tloc  += $classData['procedural']['loc'];
 			$tdloc += $classData['procedural']['dloc'];
 			$tcloc += $classData['procedural']['cloc'];
 			
 			$percentageData = self::getPercentage($tcloc, $tloc - $tdloc);
-			$fileCoverage = "<tr class=\"file-coverage\"><th>$sourceFile</th>";
+			$fileCoverage = "<tr class=\"coverage-file\"><th>$sourceFile</th>";
 			$fileCoverage .= "<td class=\"coverage-percentage\" style=\"background-color: $percentageData[1]\">$tcloc / " . ($tloc - $tdloc) . "</td>";
 			$fileCoverage .= "<td class=\"coverage-ratio\" style=\"background-color: $percentageData[1]\">$percentageData[0]%</td></tr>\n";
 			if ($renderer !== null) {
@@ -220,7 +218,7 @@
 			$lineNumbers = '';
 			
 			for ($i = 1, $len = count($lines); $i <= $len; $i++) {
-				$lineNumbers .= '<div><a name="line-' . $i . '" href="#line-' . $i . '">' . $i . '</a></div>';
+				$lineNumbers .= '<div><a name="line-' . $i . '" href="#line-' . $i . '">' . $i . '</a></div>' . "\n";
 				$code .= '<div';
 				if (isset($coverageData[$i])) {
 					$code .= ' class="';
diff --git a/src/Testify/framework/reporting/template/style.css b/src/Testify/framework/reporting/template/style.css
index b8926b2..bbbe587 100644
--- a/src/Testify/framework/reporting/template/style.css
+++ b/src/Testify/framework/reporting/template/style.css
@@ -88,6 +88,20 @@ thead th {
 	color: #000000;
 }
 
+.coverage-file {
+	background-color: #FFFFFF;
+	border-bottom: 3px solid #000000;
+}
+.coverage-class {
+	background-color: #EEEEEE;
+	border-bottom: 2px solid #000000;
+}
+.coverage-method {
+	background-color: #DDDDDD;
+}
+.coverage-method a {
+	color: #996699;
+}
 .coverage-graph td {
 	text-align: center;
 }
diff --git a/src/Testify/util/Util.php b/src/Testify/util/Util.php
index 5fd5118..9541793 100644
--- a/src/Testify/util/Util.php
+++ b/src/Testify/util/Util.php
@@ -84,7 +84,7 @@
 					$paramList .= '&';
 				}
 				
-				$paramList .= self::repairParameterName($param->getName(), $i);
+				$paramList .= '$' . self::repairParameterName($param->getName(), $i);
 				
 				if ($param->isOptional()) {
 					$paramList .= ' = ';