diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommTabbedPane.java b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommTabbedPane.java
index 2c1bbf843..474287515 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommTabbedPane.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/SIPCommTabbedPane.java
@@ -36,8 +36,8 @@ public class SIPCommTabbedPane extends JTabbedPane {
      * Creates the <code>CloseAndMaxTabbedPane</code> with an enhanced UI if
      * <code>enhancedUI</code> parameter is set to <code>true</code>.
      *
-     * @param enhancedUI
-     *            whether the tabbedPane should use an enhanced UI
+     * @param closingTabs support for closable tabs
+     * @param maximizingTabs support for maximisable tabs
      */
     public SIPCommTabbedPane(boolean closingTabs, boolean maximizingTabs) {
         super.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT);
diff --git a/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java b/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java
index 4719a8960..23900ad2d 100644
--- a/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java
+++ b/src/net/java/sip/communicator/impl/gui/customcontrols/wizard/Wizard.java
@@ -195,8 +195,7 @@ public boolean isModal() {
     /**
      * Convienence method that displays a modal wizard dialog and blocks until
      * the dialog has completed.
-     * @return Indicates how the dialog was closed. Compare this value against
-     * the RETURN_CODE constants at the beginning of the class.
+     * @param modal whether to show a modal dialog
      */    
     public void showDialog(boolean modal) {
         
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java
index 40074c9bd..fdf1a59ec 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallManager.java
@@ -528,9 +528,8 @@ public void setShown(boolean isShown)
     }
     
     /** 
-     * Answers the given callParticipant.
-     * @param pps the protocol provider to use
-     * @param callParticipant the call participant to answer to
+     * Answers the given call.
+     * @param call the call to answer
      */
     public void answerCall(Call call)
     {
@@ -564,7 +563,7 @@ public void createCall(String contact)
     /**
      * Creates a call to the given contact.
      * 
-     * @param contact the protocol contact to call to
+     * @param contacts the list of contacts to call to
      */
     public void createCall(Vector contacts)
     {
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java b/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java
index a66d16c8f..97235c75d 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/CallPanel.java
@@ -72,7 +72,8 @@ public CallPanel(CallManager callManager, Call call, String callType)
     
     /**
      * Creates an instance of CallPanel for the given call and call type.
-     * @param call the call
+     * @param callManager the CallManager that manages this panel
+     * @param contacts the list of contacts for this call panel
      */
     public CallPanel(CallManager callManager, Vector contacts)
     {
@@ -110,7 +111,8 @@ public CallPanel(CallManager callManager, Vector contacts)
 
     /**
      * Creates an instance of CallPanel for the given call and call type.
-     * @param call the call
+     * @param callManager the CallManager that manages this call panel
+     * @param contactString the contact string that we are calling
      */
     public CallPanel(CallManager callManager, String contactString)
     {
diff --git a/src/net/java/sip/communicator/impl/gui/main/call/GuiCallRecord.java b/src/net/java/sip/communicator/impl/gui/main/call/GuiCallRecord.java
index 027615b2c..32306445c 100644
--- a/src/net/java/sip/communicator/impl/gui/main/call/GuiCallRecord.java
+++ b/src/net/java/sip/communicator/impl/gui/main/call/GuiCallRecord.java
@@ -9,7 +9,6 @@
 import java.util.*;
 
 import net.java.sip.communicator.service.callhistory.*;
-import net.java.sip.communicator.service.protocol.*;
 
 /**
  * The <tt>GuiCallRecord</tt> is meant to be used in the call history to
@@ -27,11 +26,11 @@ public class GuiCallRecord
     private Date endTime;
     
     /**
-     * 
-     * @param guiParticipantRecords
-     * @param direction
-     * @param startTime
-     * @param endTime
+     * Creates an instance of <tt>GuiCallRecord<tt>.
+     * @param guiParticipantRecords participant records contained in this call
+     * record
+     * @param startTime call start time
+     * @param endTime call end time
      */
     public GuiCallRecord(Vector guiParticipantRecords,
             Date startTime,
diff --git a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java
index 196d7b613..ea5daaf44 100644
--- a/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java
+++ b/src/net/java/sip/communicator/impl/gui/main/contactlist/ContactList.java
@@ -131,8 +131,8 @@ public void protoContactAdded(ProtoContactEvent evt)
      */
     public void protoContactRemoved(ProtoContactEvent evt)
     {
+        System.out.println("REMOVE PROTO CONTACT");
         this.modifyContact(evt.getOldParent());
-        this.modifyContact(evt.getNewParent());
     }
 
     /**