diff --git a/NEWS b/NEWS
index 24cb7879..da36c66e 100644
--- a/NEWS
+++ b/NEWS
@@ -2,11 +2,13 @@
 
 ** Release 0.9.2 (not yet released)
 
-   - better support for Solaris builds
-   - output searches as plain text, XML, JSON or s-expressions using 
-     --format=plain|xml|json|sexp
+   - stricter checking of options; and options must now *follow* the sub-command
+     (if any); so, something like: 'mu index --maildir=/foo/bar'
+   - output searches as plain text (default), XML, JSON or s-expressions using 
+     --format=plain|xml|json|sexp. For example: 'mu find foobar
+     --output=json'. These format options  are experimental (except for 'plain')
    - the --xquery option should now be used as --format=xquery, for output
-     symlinks, use --format=links
+     symlinks, use --format=links. This is a change in the options.
    - search output can include the message size using the 'z' shortcut
    - match message size ranges (i.e.. size:500k..2M)
    - fix: honor the --overwrite (or lack thereof) parameter
@@ -15,6 +17,7 @@
    - when --maildir= is not provided for mu index, default to the last one
    - add --max-msg-size, to specify a new maximum message size
    - move the 'mug' UI to toys/mug; no longer installable
+   - better support for Solaris builds, Gentoo.
 
 ** Release 0.9.1 <2010-12-05 Sun>
    
diff --git a/man/mu-extract.1 b/man/mu-extract.1
index b46aca81..71846aec 100644
--- a/man/mu-extract.1
+++ b/man/mu-extract.1
@@ -1,4 +1,4 @@
-.TH MU EXTRACT 1 "January 2011" "User Manuals"
+.TH MU EXTRACT 1 "February 2011" "User Manuals"
 
 .SH NAME 
 
@@ -16,7 +16,8 @@ require the message to be indexed.
 
 For attachments, the file name specified in the mail message is used (if
 any). If there is no name, or when saving other mime-parts, a name is used
-derived from the message-id of the message.
+derived from the message-id of the message. Without any options, \fBmu
+extract\fR simply outputs the list of MIME-parts in the message.
 
 .SH OPTIONS
 
diff --git a/www/index.html b/www/index.html
index e322353d..e2826ddd 100644
--- a/www/index.html
+++ b/www/index.html
@@ -75,10 +75,11 @@ up-to-date. Or you could trigger it when new mails have arrived.
 <p>After building the database, it's easy to search for messages. For example:
 <ul>
   <li>
-    <i>get all mails about birds <b>and</b> bees</i> (and similar words)<pre>
-    $ mu find bird bee</pre>
+    <i>get all mails about birds <b>and</b> bees</i> somewhere in the message
+    or headers: <pre>
+    $ mu find birds bees</pre>
   if you want to find message with either one of those, you can do:<pre>
-    $ mu find 'bird OR bee'</pre>
+    $ mu find 'birds OR bees'</pre>
   </li>
   <li>
     <i>get all Smith's mails with 'capybara' in the subject line</i><pre>
@@ -124,19 +125,24 @@ your mails must be stored in a set of <a
 href="http://www.qmail.org/qmail-manual-html/man5/maildir.html" >maildirs</a>
 
 <h2><a name="mug" >mug</a><a href="mug-full.png"><img src="mug-thumb.png"
-align="right" border="0"></a></h2>
-Starting with version 0.9, there is now a
-simple UI called <tt>mug</tt>. It started as a little experiment, but it seems
-to be useful enough to include. Usage should be straigthforward.
-
-<p>The longer-term goal is to have a bit more complete graphical
-user-interface; for the time being, <tt>mug</tt> seems to work fine.
-
-<p>If you have defined bookmarks, mug will show them in the toolbar on the left
-side of the <tt>mug</tt>-window, as can be seen in the screenshot.
+align="right" border="0"></a></h2> Starting with version 0.9.2, there is
+now <b>two</b> toy UIs for <tt>mu</tt>, called <tt>mug</tt>
+and <tt>mug2</tt>. The latter has more features, but also adds some
+dependencies if you want it - both <tt>mug</tt>/<tt>mug2</tt> are
+optional. The longer-term goal is to have a bit more complete graphical
+user-interface. Currently, the UIs are not installed, you need to run them
+from their build directory. If you have defined bookmarks, the are shown in
+the toolbar on the left side of the window, as can be seen in the screenshot.
 
 <h2><a name="news" >news</a></h2>
 <ul>
+  <li>[2011-02-02] <strong>mu version 0.9.2</strong> released, with a few new
+  features, such as size-based matching (e.g,. <tt>size:2k..2m</tt> to match
+  message between 2kB and 2MB), (experimental) output in XML/JSON/s-expression
+  format, updated toy-UI ('mug' and 'mug2'), support for Solaris and
+  Gentoo. For a complete list of the user-visible changes and some of the
+  changes in command-line parameters, see
+  <a href="http://gitorious.org/mu/mu-ng/blobs/master/NEWS">NEWS</a>.
   <li>[2010-12-05] <strong>mu version 0.9.1</strong> released; fixes a couple
   of issues users found with a missing icon, the unit-tests.
   <li>[2010-12-04] <strong>mu version 0.9</strong> released. Compared to the