diff --git a/mbuni/doc/userguide.shtml b/mbuni/doc/userguide.shtml
index b97eb66..7cb4136 100644
--- a/mbuni/doc/userguide.shtml
+++ b/mbuni/doc/userguide.shtml
@@ -448,25 +448,21 @@ Kannel in a non-standard location, you will need to supply the location to <tt>c
 
 
 <p >Mbuni consists of
-4 programs:
+3 programs:
 <ul>
-<li><tt>mmsc/mmsrelay</tt>
-<li><tt>mmsc/mmsproxy</tt>
-<li><tt>mmsc/mmsfromemail</tt>
-<li><tt>mmsbox/mmsbox</tt>
+<li><tt>mmsc</tt>
+<li><tt>mmsfromemail</tt>
+<li><tt>mmsbox</tt>
 </ul>
 which are by
 default installed in <tt>/usr/local/bin</tt>
 </p>
 
-<p ><tt>mmsrelay</tt> is the main relay server of the MMSC. It routes
+<p ><tt>mmsc</tt> is the MMSC component. It consists of the relay
+  server (<tt>mmsrelay</tt>), which routes
 incoming messages to email, other MMS gateways, MMS clients/handsets,
-etc. It also manages routing messages to MMS clients 
-using WAP Push, sending of delivery reports, etc.
-<br><br>
- <tt>mmsproxy</tt>
-provides the HTTP interface of the MMSC via which messages are 
-sent and received by MMS clients. <br><br><tt>mmsfromemail </tt>is
+  and the client-facing MMSC interface (<tt>mmsproxy</tt>) via which messages are 
+sent and received by MMS clients (MM1 as well as MM7). <br><br><tt>mmsfromemail </tt>is
 the email2MMS MMSC module. <br><br><tt>mmsbox</tt> is the VAS gateway
 
 </p>
@@ -534,8 +530,7 @@ is not very efficient but it works (which is important!)</p>
  operation. We look at the two usage scenarios below.
  
 <h4><a name="run_mmsc"></a>Running Mbuni as a MMSC</h4>
-<p>To run the MMSC, you must run  (<tt>mmsrelay</tt>
-and <tt>mmsproxy</tt>). <tt>mmsfromemail</tt>
+<p>To run the MMSC, you must run  the command <tt>mmsc</tt>. <tt>mmsfromemail</tt>
 should be called from your MTA (SMTP Mailer) to convert
 and deliver an MMS from an email sender. The order in which they are started
 is unimportant. </p>
diff --git a/mbuni/extras/pgsql-queue/Readme.txt b/mbuni/extras/pgsql-queue/Readme.txt
index 8bd5e00..f88597a 100644
--- a/mbuni/extras/pgsql-queue/Readme.txt
+++ b/mbuni/extras/pgsql-queue/Readme.txt
@@ -2,7 +2,7 @@ This module provides Queue management for mbuni using PostgreSQL as the storage
 To use it, you need only add two lines to the mbuni config 'mbuni' group:
 
 queue-manager-module = "/path_to/libmms_pgsql_queue.so"
-queue-module-init-data = "number_of_db_connections:host=dbhost user=db_user password=dbpassword dbname=dbname"
+queue-module-init-data = "host=dbhost user=db_user password=dbpassword dbname=dbname"
 
 Make sure the database you are trying to connect to has already been created
 and the relevant tables created using the supplied file "tables.sql".  
diff --git a/mbuni/mmsc/mmsc.c b/mbuni/mmsc/mmsc.c
index e8aad29..4e9fd99 100644
--- a/mbuni/mmsc/mmsc.c
+++ b/mbuni/mmsc/mmsc.c
@@ -67,7 +67,7 @@ int main(int argc, char *argv[])
      mms_cfg_destroy(cfg);
      
      if (!settings) 
-	  panic(0, "No global MMSC configuration!");
+	  panic(0, "No MMSC configuration!");
 
 
      signal(SIGHUP, relog_now);