6 files changed, 10 insertions, 10 deletions
diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index 702a7a7ee..fad936528 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -270,9 +270,9 @@ static bool chan_kvs_fnc_topicsetat(KviKvsModuleFunctionCall * c)
 		is a channel at all). If the current window is not a channel, a warning is printed
 		and an empty string is returned.[br]
 		The second form returns the number of users on the channel specified by <window_id>.[br]
-		The number of users is returned if it is known form at the call time: this means that
-		if the channel is not synchronized with the server (as just after the join, for example)
-		you might get a number that is actually smaller.[br]
+		The number of users returned depends on the state of KVIrc's data on the channel, which will be 
+		out-of-synch with the server just after the channel is joined. If the function is used prior to 
+		the channel's OnChannelSync event, a smaller user count than there really is will be returned. 
 */
 static bool chan_kvs_fnc_usercount(KviKvsModuleFunctionCall * c)
 {
diff --git a/src/modules/lamerizer/libkvilamerizer.cpp b/src/modules/lamerizer/libkvilamerizer.cpp
index 0041deb35..409c4d0eb 100644
--- a/src/modules/lamerizer/libkvilamerizer.cpp
+++ b/src/modules/lamerizer/libkvilamerizer.cpp
@@ -48,9 +48,8 @@
 #ifdef COMPILE_CRYPT_SUPPORT
 	
 	#include "KviMemory.h"
-	#include "KviMemory.h"
-
 	#include "KviPointerList.h"
+	#include "KviCryptEngineDescription.h"
 
 	static KviPointerList<KviCryptEngine> * g_pEngineList = 0;
 
diff --git a/src/modules/popup/libkvipopup.cpp b/src/modules/popup/libkvipopup.cpp
index 3151f8181..e31142226 100644
--- a/src/modules/popup/libkvipopup.cpp
+++ b/src/modules/popup/libkvipopup.cpp
@@ -706,10 +706,10 @@ static bool popup_kvs_fnc_isEmpty(KviKvsModuleFunctionCall * c)
 	@syntax:
 		$popup.currentItemId()
 	@short:
-		Returns the current id popup
+		Returns the popup item id that owns the executing code
 	@description:
-		When called inside a popup item's callback, this functions returns the id of that popup item.
-		This function returns $null when called outside a popup item's callback.
+		When called inside a popup item's callback, this function returns the id of the popup item.
+		Outside of callback code, $null is returned. 
 	@examples:
 		[example]
 			#clean any previous popup by the same name
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
index c5cf5bd0b..d4c3fd83c 100644
--- a/src/modules/rijndael/libkvirijndael.cpp
+++ b/src/modules/rijndael/libkvirijndael.cpp
@@ -64,6 +64,7 @@
 #if defined(COMPILE_CRYPT_SUPPORT) || defined(Q_MOC_RUN)
 	#include "KviMemory.h"
 	#include "KviPointerList.h"
+	#include "KviCryptEngineDescription.h"
 
 	static KviPointerList<KviCryptEngine> * g_pEngineList = 0;
 
diff --git a/src/modules/rijndael/libkvirijndael_cryptopp.cpp b/src/modules/rijndael/libkvirijndael_cryptopp.cpp
index 8b8c7fb8d..19cd42dcd 100644
--- a/src/modules/rijndael/libkvirijndael_cryptopp.cpp
+++ b/src/modules/rijndael/libkvirijndael_cryptopp.cpp
@@ -30,6 +30,7 @@
 #include "KviLocale.h"
 #include "KviMircCntrl.h"
 #include "KviPointerList.h"
+#include "KviCryptEngineDescription.h"
 
 #include <cryptopp/aes.h>
 #include <cryptopp/blowfish.h>
diff --git a/src/modules/rot13/libkvirot13.cpp b/src/modules/rot13/libkvirot13.cpp
index 622c23616..ad31af3b2 100644
--- a/src/modules/rot13/libkvirot13.cpp
+++ b/src/modules/rot13/libkvirot13.cpp
@@ -48,9 +48,8 @@
 #ifdef COMPILE_CRYPT_SUPPORT
 
 	#include "KviMemory.h"
-	#include "KviMemory.h"
-
 	#include "KviPointerList.h"
+	#include "KviCryptEngineDescription.h"
 
 	static KviPointerList<KviCryptEngine> * g_pEngineList = 0;