diff --git a/src/org/kreed/vanilla/SongTimeline.java b/src/org/kreed/vanilla/SongTimeline.java
index 7eb4a6a1..6dc38f0b 100644
--- a/src/org/kreed/vanilla/SongTimeline.java
+++ b/src/org/kreed/vanilla/SongTimeline.java
@@ -38,9 +38,8 @@ import java.util.ListIterator;
 import junit.framework.Assert;
 
 /**
- * Represents a series of songs that can be moved through backward or forward.
- * Automatically handles the fetching of new (random) songs when a song does not
- * exist at a requested position.
+ * Contains the list of currently playing songs, implements repeat and shuffle
+ * support, and contains methods to fetch more songs from the MediaStore.
  */
 public final class SongTimeline {
 	/**
@@ -50,7 +49,7 @@ public final class SongTimeline {
 	 */
 	public static final int FINISH_STOP = 0;
 	/**
-	 * Repeat from the begining.
+	 * Repeat from the beginning.
 	 *
 	 * @see SongTimeline#setFinishAction(int)
 	 */
@@ -206,6 +205,9 @@ public final class SongTimeline {
 	private Song mSavedCurrent;
 	private Song mSavedNext;
 
+	/**
+	 * Interface to respond to timeline changes.
+	 */
 	public interface Callback {
 		/**
 		 * Called when an active song in the timeline is replaced by a method
diff --git a/src/org/kreed/vanilla/WidgetD.java b/src/org/kreed/vanilla/WidgetD.java
index 3e5c78d8..47ff7a6d 100644
--- a/src/org/kreed/vanilla/WidgetD.java
+++ b/src/org/kreed/vanilla/WidgetD.java
@@ -33,8 +33,8 @@ import android.view.View;
 import android.widget.RemoteViews;
 
 /**
- * 2x2 widget that shows title, artist, a (hidden) play/pause button, a (hidden)
- * next button, and cover art in the background.
+ * 2x2 widget that shows cover art in the background and playback controls in
+ * a semi-transparent widget on top of the cover.
  */
 public class WidgetD extends AppWidgetProvider {
 	private static boolean sEnabled;