diff --git a/src/org/kreed/vanilla/LibraryActivity.java b/src/org/kreed/vanilla/LibraryActivity.java
index e441c4ae..a598fce4 100644
--- a/src/org/kreed/vanilla/LibraryActivity.java
+++ b/src/org/kreed/vanilla/LibraryActivity.java
@@ -358,7 +358,7 @@ public class LibraryActivity
 	 * Adds songs matching the data from the given intent to the song timelime.
 	 *
 	 * @param intent An intent created with
-	 * {@link LibraryActivity#createClickIntent(LibraryAdapter,MediaView)}.
+	 * {@link LibraryAdapter#createData(View)}.
 	 * @param action One of LibraryActivity.ACTION_*
 	 */
 	private void pickSongs(Intent intent, int action)
@@ -396,7 +396,7 @@ public class LibraryActivity
 	 * from the view and switching to the appropriate tab.
 	 *
 	 * @param intent An intent created with
-	 * {@link LibraryActivity#createClickIntent(LibraryAdapter,MediaView)}.
+	 * {@link LibraryAdapter#createData(View)}.
 	 */
 	private void expand(Intent intent)
 	{
@@ -421,7 +421,7 @@ public class LibraryActivity
 	/**
 	 * Called by LibraryAdapters when a row has been clicked.
 	 *
-	 * @param row The data for the row that was clicked.
+	 * @param rowData The data for the row that was clicked.
 	 */
 	public void onItemClicked(Intent rowData)
 	{
@@ -446,7 +446,7 @@ public class LibraryActivity
 	/**
 	 * Called by LibraryAdapters when a row's expand arrow has been clicked.
 	 *
-	 * @param row The data for the row that was clicked.
+	 * @param rowData The data for the row that was clicked.
 	 */
 	public void onItemExpanded(Intent rowData)
 	{
@@ -563,7 +563,7 @@ public class LibraryActivity
 	 * Builds a media query based off the data stored in the given intent.
 	 *
 	 * @param intent An intent created with
-	 * {@link LibraryActivity#createClickIntent(LibraryAdapter,MediaView)}.
+	 * {@link LibraryAdapter#createData(View)}.
 	 * @param empty If true, use the empty projection (only query id).
 	 * @param all If true query all songs in the adapter; otherwise query based
 	 * on the row selected.
@@ -644,7 +644,7 @@ public class LibraryActivity
 	 *
 	 * @param playlistId The id of the playlist to add to.
 	 * @param intent An intent created with
-	 * {@link LibraryActivity#createClickIntent(LibraryAdapter,MediaView)}.
+	 * {@link LibraryAdapter#createData(View)}.
 	 */
 	private void addToPlaylist(long playlistId, Intent intent)
 	{
@@ -671,7 +671,7 @@ public class LibraryActivity
 	 * informing the user of this.
 	 *
 	 * @param intent An intent created with
-	 * {@link LibraryActivity#createClickIntent(LibraryAdapter,MediaView)}.
+	 * {@link LibraryAdapter#createData(View)}.
 	 */
 	private void delete(Intent intent)
 	{
diff --git a/src/org/kreed/vanilla/LibraryAdapter.java b/src/org/kreed/vanilla/LibraryAdapter.java
index 4e07ae32..385fc7ff 100644
--- a/src/org/kreed/vanilla/LibraryAdapter.java
+++ b/src/org/kreed/vanilla/LibraryAdapter.java
@@ -127,11 +127,11 @@ public interface LibraryAdapter extends ListAdapter {
 	public static final String DATA_TYPE = "type";
 	/**
 	 * Extra for row data: canonical file path. type: String. Only present if
-	 * type is {@link MediaUtils.TYPE_FILE}.
+	 * type is {@link MediaUtils#TYPE_FILE}.
 	 */
 	public static final String DATA_FILE = "file";
 	/**
 	 * Extra for row data: if true, row has expander arrow. type: boolean.
 	 */
 	public static final String DATA_EXPANDABLE = "expandable";
-}
\ No newline at end of file
+}
diff --git a/src/org/kreed/vanilla/MediaAdapter.java b/src/org/kreed/vanilla/MediaAdapter.java
index 303d17ad..f2df67e2 100644
--- a/src/org/kreed/vanilla/MediaAdapter.java
+++ b/src/org/kreed/vanilla/MediaAdapter.java
@@ -144,8 +144,6 @@ public class MediaAdapter
 	 * @param type The type of media to represent. Must be one of the
 	 * Song.TYPE_* constants. This determines which content provider to query
 	 * and what fields to display in the views.
-	 * @param expandable Whether an expand arrow should be shown to the right
-	 * of the views' text
 	 * @param limiter An initial limiter to use
 	 */
 	public MediaAdapter(LibraryActivity activity, int type, Limiter limiter)