diff --git a/src/itdelatrisu/opsu/beatmap/BeatmapSet.java b/src/itdelatrisu/opsu/beatmap/BeatmapSet.java
index 256a41dd..8ba0693b 100644
--- a/src/itdelatrisu/opsu/beatmap/BeatmapSet.java
+++ b/src/itdelatrisu/opsu/beatmap/BeatmapSet.java
@@ -139,7 +139,7 @@ public class BeatmapSet {
 	/**
 	 * Checks whether the beatmap set matches a given condition.
 	 * @param type the condition type (ar, cs, od, hp, bpm, length)
-	 * @param operator the operator (=/==, >, >=, <, <=)
+	 * @param operator the operator {@literal (=/==, >, >=, <, <=)}
 	 * @param value the value
 	 * @return true if the condition is met
 	 */
diff --git a/src/itdelatrisu/opsu/ui/MenuButton.java b/src/itdelatrisu/opsu/ui/MenuButton.java
index 1b59ba08..7370d0bc 100644
--- a/src/itdelatrisu/opsu/ui/MenuButton.java
+++ b/src/itdelatrisu/opsu/ui/MenuButton.java
@@ -148,7 +148,7 @@ public class MenuButton {
 	 * Sets text to draw in the middle of the button.
 	 * @param text the text to draw
 	 * @param font the font to use when drawing
-	 * @color the color to draw the text
+	 * @param color the color to draw the text
 	 */
 	public void setText(String text, Font font, Color color) {
 		this.text = text;
diff --git a/src/org/newdawn/slick/GameContainer.java b/src/org/newdawn/slick/GameContainer.java
index 3c6cff2d..01c7604f 100644
--- a/src/org/newdawn/slick/GameContainer.java
+++ b/src/org/newdawn/slick/GameContainer.java
@@ -555,8 +555,8 @@ public abstract class GameContainer implements GUIContext {
 	 * bottom.
 	 * 
 	 * @param ref The reference to the image to be loaded
-	 * @param x The x-coordinate of the cursor hotspot (left -> right)
-	 * @param y The y-coordinate of the cursor hotspot (bottom -> top)
+	 * @param x The x-coordinate of the cursor hotspot (left {@literal ->} right)
+	 * @param y The y-coordinate of the cursor hotspot (bottom {@literal ->} top)
 	 * @param width The x width of the cursor
 	 * @param height The y height of the cursor
 	 * @param cursorDelays image delays between changing frames in animation
diff --git a/src/org/newdawn/slick/Image.java b/src/org/newdawn/slick/Image.java
index 05027b9b..1737a808 100644
--- a/src/org/newdawn/slick/Image.java
+++ b/src/org/newdawn/slick/Image.java
@@ -935,7 +935,7 @@ public class Image implements Renderable {
 	
     /**
      * Set the angle to rotate this image to.  The angle will be normalized to 
-     * be 0 <= angle < 360.  The image will be rotated around its center.
+     * be {@literal 0 <= angle < 360}.  The image will be rotated around its center.
      * 
      * @param angle The angle to be set
      */
@@ -973,7 +973,7 @@ public class Image implements Renderable {
     
     /**
      * Add the angle provided to the current rotation.  The angle will be normalized to 
-     * be 0 <= angle < 360.  The image will be rotated around its center.
+     * be {@literal 0 <= angle < 360}.  The image will be rotated around its center.
      *  
      * @param angle The angle to add.
      */
diff --git a/src/org/newdawn/slick/Music.java b/src/org/newdawn/slick/Music.java
index e15b7ee5..36dd3ca5 100644
--- a/src/org/newdawn/slick/Music.java
+++ b/src/org/newdawn/slick/Music.java
@@ -42,7 +42,7 @@ import org.newdawn.slick.util.Log;
  * play at any given time and a channel is reserved so music will always play. 
  *
  * @author kevin
- * @author Nathan Sweet <misc@n4te.com>
+ * @author Nathan Sweet {@literal <misc@n4te.com>}
  */
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class Music {
diff --git a/src/org/newdawn/slick/openal/OpenALStreamPlayer.java b/src/org/newdawn/slick/openal/OpenALStreamPlayer.java
index 8fbe3694..2e737886 100644
--- a/src/org/newdawn/slick/openal/OpenALStreamPlayer.java
+++ b/src/org/newdawn/slick/openal/OpenALStreamPlayer.java
@@ -46,7 +46,7 @@ import org.newdawn.slick.util.ResourceLoader;
  * as required.
  * 
  * @author Kevin Glass
- * @author Nathan Sweet <misc@n4te.com>
+ * @author Nathan Sweet  {@literal <misc@n4te.com>}
  * @author Rockstar play and setPosition cleanup 
  */
 public class OpenALStreamPlayer {