diff --git a/src/core/PaperScope.js b/src/core/PaperScope.js
index 17278285..c3798cf2 100644
--- a/src/core/PaperScope.js
+++ b/src/core/PaperScope.js
@@ -126,7 +126,8 @@ var PaperScope = this.PaperScope = Base.extend(/** @lends PaperScope# */{
 	 * paper.install(window);
 	 */
 	install: function(scope) {
-		// Define project, view and tool as getters, so they are kept up to date
+		// Define project, view and tool as getters that redirect to these
+		// values on the PaperScope, so they are kept up to date
 		var that = this;
 		Base.each(['project', 'view', 'tool'], function(key) {
 			Base.define(scope, key, {
diff --git a/src/item/HitResult.js b/src/item/HitResult.js
index cfa58b24..50c5240e 100644
--- a/src/item/HitResult.js
+++ b/src/item/HitResult.js
@@ -20,8 +20,6 @@
  * @class A HitResult object contains information about the results of a hit
  * test. It is returned by {@link Item#hitTest(point)} and
  * {@link Project#hitTest(point)}.
- *
- * @extends CurveLocation
  */
 HitResult = Base.extend(/** @lends HitResult# */{
 	initialize: function(type, item, values) {
diff --git a/src/item/Item.js b/src/item/Item.js
index d31c15fd..75b73eef 100644
--- a/src/item/Item.js
+++ b/src/item/Item.js
@@ -695,18 +695,19 @@ var Item = this.Item = Base.extend(/** @lends Item# */{
 	 * <b>options.type:</b> Only hit test again a certain item
 	 * type: {@link PathItem}, {@link Raster}, {@link TextItem}, etc.
 	 * <b>options.fill:</b> {@code Boolean} - Hit test the fill of items.
-	 * <b>options.stroke:</b> {@code Boolean} - Hit test the curves of path items,
-	 * taking into account stroke width.
-	 * <b>options.segment:</b> {@code Boolean} - Hit test for {@link Segment#point} of
-	 * {@link Path} items.
+	 * <b>options.stroke:</b> {@code Boolean} - Hit test the curves of path
+	 * items, taking into account stroke width.
+	 * <b>options.segment:</b> {@code Boolean} - Hit test for
+	 * {@link Segment#point} of {@link Path} items.
 	 * <b>options.handles:</b> {@code Boolean} - Hit test for the handles
 	 * ({@link Segment#handleIn} / {@link Segment#handleOut}) of path segments.
-	 * <b>options.ends:</b> {@code Boolean} - Only hit test for the first or last
-	 * segment points of open path items.
-	 * <b>options.bounds:</b> {@code Boolean} - Hit test the corners and side-centers
-	 * of the bounding rectangle of items ({@link Item#bounds}).
-	 * <b>options.center:</b> {@code Boolean} - Hit test the {@link Rectangle#center}
-	 * of the bounding rectangle of items ({@link Item#bounds}).
+	 * <b>options.ends:</b> {@code Boolean} - Only hit test for the first or
+	 * last segment points of open path items.
+	 * <b>options.bounds:</b> {@code Boolean} - Hit test the corners and
+	 * side-centers of the bounding rectangle of items ({@link Item#bounds}).
+	 * <b>options.center:</b> {@code Boolean} - Hit test the
+	 * {@link Rectangle#center} of the bounding rectangle of items
+	 * ({@link Item#bounds}).
 	 * <b>options.guide:</b> {@code Boolean} - Hit test items that have
 	 * {@link Item#guide} set to {@code true}.
 	 * <b>options.selected:</b> {@code Boolean} - Only hit selected items.
diff --git a/src/project/Project.js b/src/project/Project.js
index dc340494..ea141b06 100644
--- a/src/project/Project.js
+++ b/src/project/Project.js
@@ -187,26 +187,27 @@ var Project = this.Project = Base.extend(/** @lends Project# */{
 	 * 
 	 * The optional options object allows you to control the specifics of the
 	 * hit test and may contain a combination of the following values:
-	 * <b>tolerance:</b> {@code Number} - The tolerance of the hit test in
-	 * points.
-	 * <b>type:</b> Only hit test again a certain item
+	 * <b>options.tolerance:</b> {@code Number} - The tolerance of the hit test
+	 * in points.
+	 * <b>options.type:</b> Only hit test again a certain item
 	 * type: {@link PathItem}, {@link Raster}, {@link TextItem}, etc.
-	 * <b>fill:</b> {@code Boolean} - Hit test the fill of items.
-	 * <b>stroke:</b> {@code Boolean} - Hit test the curves of path items,
-	 * taking into account stroke width.
-	 * <b>segment:</b> {@code Boolean} - Hit test for {@link Segment#point} of
-	 * {@link Path} items.
-	 * <b>handles:</b> {@code Boolean} - Hit test for the handles
+	 * <b>options.fill:</b> {@code Boolean} - Hit test the fill of items.
+	 * <b>options.stroke:</b> {@code Boolean} - Hit test the curves of path
+	 * items, taking into account stroke width.
+	 * <b>options.segment:</b> {@code Boolean} - Hit test for
+	 * {@link Segment#point} of {@link Path} items.
+	 * <b>options.handles:</b> {@code Boolean} - Hit test for the handles
 	 * ({@link Segment#handleIn} / {@link Segment#handleOut}) of path segments.
-	 * <b>ends:</b> {@code Boolean} - Only hit test for the first or last
-	 * segment points of open path items.
-	 * <b>bounds:</b> {@code Boolean} - Hit test the corners and side-centers
-	 * of the bounding rectangle of items ({@link Item#bounds}).
-	 * <b>center:</b> {@code Boolean} - Hit test the {@link Rectangle#center}
-	 * of the bounding rectangle of items ({@link Item#bounds}).
-	 * <b>guide:</b> {@code Boolean} - Hit test items that have
+	 * <b>options.ends:</b> {@code Boolean} - Only hit test for the first or
+	 * last segment points of open path items.
+	 * <b>options.bounds:</b> {@code Boolean} - Hit test the corners and
+	 * side-centers of the bounding rectangle of items ({@link Item#bounds}).
+	 * <b>options.center:</b> {@code Boolean} - Hit test the
+	 * {@link Rectangle#center} of the bounding rectangle of items
+	 * ({@link Item#bounds}).
+	 * <b>options.guide:</b> {@code Boolean} - Hit test items that have
 	 * {@link Item#guide} set to {@code true}.
-	 * <b>selected:</b> {@code Boolean} - Only hit selected items.
+	 * <b>options.selected:</b> {@code Boolean} - Only hit selected items.
 	 *
 	 * @param {Point} point The point where the hit test should be performed
 	 * @param {Object} [options={ fill: true, stroke: true, segments: true,