diff --git a/DroidFish/src/org/petero/droidfish/ChessBoard.java b/DroidFish/src/org/petero/droidfish/ChessBoard.java
index 79460ed..f631466 100644
--- a/DroidFish/src/org/petero/droidfish/ChessBoard.java
+++ b/DroidFish/src/org/petero/droidfish/ChessBoard.java
@@ -509,8 +509,8 @@ public class ChessBoard extends View {
 
     private Rect labelBounds = null;
 
-    private void drawLabel(Canvas canvas, int xCrd, int yCrd, boolean right,
-                           boolean bottom, char c) {
+    private final void drawLabel(Canvas canvas, int xCrd, int yCrd, boolean right,
+                                 boolean bottom, char c) {
         String s = "";
         s += c;
         if (labelBounds == null) {
diff --git a/DroidFish/src/org/petero/droidfish/GUIInterface.java b/DroidFish/src/org/petero/droidfish/GUIInterface.java
index cd8d9b8..ee141f7 100644
--- a/DroidFish/src/org/petero/droidfish/GUIInterface.java
+++ b/DroidFish/src/org/petero/droidfish/GUIInterface.java
@@ -37,7 +37,8 @@ public interface GUIInterface {
     final static class GameStatus {
         public Game.GameState state = Game.GameState.ALIVE;
         public int moveNr = 0;
-        public String drawInfo = ""; // Move required to claim draw, or empty string
+        /** Move required to claim draw, or empty string. */
+        public String drawInfo = "";
         public boolean white = false;
         public boolean ponder = false;
         public boolean thinking = false;
diff --git a/DroidFish/src/org/petero/droidfish/engine/DroidComputerPlayer.java b/DroidFish/src/org/petero/droidfish/engine/DroidComputerPlayer.java
index 7a8e546..7bfcf57 100644
--- a/DroidFish/src/org/petero/droidfish/engine/DroidComputerPlayer.java
+++ b/DroidFish/src/org/petero/droidfish/engine/DroidComputerPlayer.java
@@ -44,7 +44,9 @@ public class DroidComputerPlayer {
     private UCIEngine uciEngine = null;
     private SearchListener listener;
     private DroidBook book;
+    /** Set when "ucinewgame" needs to be sent. */
     private boolean newGame = false;
+    /** Engine identifier, "cuckoochess" or "stockfish". */
     private String engine = "";
     /** >1 if multiPV mode is supported. */
     private int maxPV = 1;
diff --git a/DroidFish/src/org/petero/droidfish/engine/UCIEngine.java b/DroidFish/src/org/petero/droidfish/engine/UCIEngine.java
index ce15901..9627e9b 100644
--- a/DroidFish/src/org/petero/droidfish/engine/UCIEngine.java
+++ b/DroidFish/src/org/petero/droidfish/engine/UCIEngine.java
@@ -44,8 +44,12 @@ public interface UCIEngine {
     /** Add strength information to the engine name. */
     public String addStrengthToName();
 
-    /** Set an engine option. */
+    /** Set an engine integer option. */
     public void setOption(String name, int value);
+
+    /** Set an engine boolean option. */
     public void setOption(String name, boolean value);
+
+    /** Set an engine string option. */
     public void setOption(String name, String value);
 }
diff --git a/DroidFish/src/org/petero/droidfish/gamelogic/Position.java b/DroidFish/src/org/petero/droidfish/gamelogic/Position.java
index af613b2..de5bd4a 100644
--- a/DroidFish/src/org/petero/droidfish/gamelogic/Position.java
+++ b/DroidFish/src/org/petero/droidfish/gamelogic/Position.java
@@ -149,7 +149,7 @@ public class Position {
         return (x & 1) == (y & 1);
     }
 
-    /** Return piece occuping a square. */
+    /** Return piece occupying a square. */
     public final int getPiece(int square) {
         return squares[square];
     }
diff --git a/DroidFish/src/org/petero/droidfish/gamelogic/SearchListener.java b/DroidFish/src/org/petero/droidfish/gamelogic/SearchListener.java
index 1daa7d1..5a99814 100644
--- a/DroidFish/src/org/petero/droidfish/gamelogic/SearchListener.java
+++ b/DroidFish/src/org/petero/droidfish/gamelogic/SearchListener.java
@@ -23,7 +23,7 @@ import java.util.List;
 
 
 /**
- * Used to get various search information during search
+ * Used to get various search information during search.
  */
 public interface SearchListener {
     public final static class PvInfo {