diff --git a/website/cli.html b/website/cli.html
index b8be0894..49e0ad66 100644
--- a/website/cli.html
+++ b/website/cli.html
@@ -56,8 +56,8 @@
 			
 			<div class="content">
 				<div class="screenshot" style="border:none; box-shadow:none; background:white">
-					<img alt="screenshot" src="screenshots/medium/cli.png" />
-				</div>			
+					<a target="_blank" href="screenshots/original/cli.png"><img alt="screenshot" src="screenshots/medium/cli.png" /></a>
+				</div>
 				<div class="section about">
 					<h2>About</h2>
 					<p>
@@ -138,13 +138,13 @@
 						</tr>
 						<tr>
 							<td>--format</td>
-							<td><a href="naming.html">episode format expression</a></td>
-							<td><code st><span class="block start">{</span><span class="variable">n</span><span class="block end">}</span> - <span class="block start">{</span><span class="string">'S'</span>+<span class="variable">s</span>.<span class="method"><span class="method">pad</span></span>(<span class="numeral">2</span>)<span class="block end">}</span>E<span class="block start">{</span><span class="variable">e</span>.<span class="method">pad</span>(<span class="numeral">2</span>)<span class="block end">}</span> - <span class="block start">{</span><span class="variable">t</span><span class="block end">}</span></code></td>
+							<td><a href="naming.html">naming scheme</a></td>
+							<td><a href="naming.html">movie or episode format expression</a></td>
 						</tr>
 						<tr>
 							<td>-non-strict</td>
 							<td>use less strict matching</td>
-							<td></td>
+							<td><small class="comment">(off by default)</small></td>
 						</tr>
 						<tr>
 							<td>-get-subtitles</td>
diff --git a/website/data/release-groups.txt b/website/data/release-groups.txt
index 0f47f983..d9b43d32 100644
--- a/website/data/release-groups.txt
+++ b/website/data/release-groups.txt
@@ -255,7 +255,7 @@ trentalent
 TruCK
 TVA
 TX
-ULTiMATEx264
+ULTiMATE
 UMF
 USELESS
 VanRay
diff --git a/website/naming.html b/website/naming.html
index 8318f55b..aca5f0d5 100644
--- a/website/naming.html
+++ b/website/naming.html
@@ -76,13 +76,19 @@
 					<code><span class="block start">{</span><span class="variable">n</span><span class="block end">}</span> - <span class="block start">{</span><span class="string">'S'</span>+<span class="variable">s</span>.<span class="method"><span class="method">pad</span></span>(<span class="numeral">2</span>)<span class="block end">}</span>E<span class="block start">{</span><span class="variable">e</span>.<span class="method">pad</span>(<span class="numeral">2</span>)<span class="block end">}</span> - <span class="block start">{</span><span class="variable">t</span><span class="block end">}</span></code>Dark Angel - S03E01 - Labyrinth
 					</p>
 					<p>
-					<code><span class="block start">{</span><span class="variable">n</span><span class="block end">}</span> - <span class="block start">{</span><span class="variable">s</span>+<span class="string">'x'</span><span class="block end">}</span><span class="block start">{</span><span class="variable">e</span>.<span class="method">pad</span>(<span class="numeral">2</span>)<span class="block end">}</span></code>Dark Angel - 3x01 - Labyrinth
-					</p>
-					<p>
 					<code><span class="block start">{</span><span class="variable">n</span>.<span class="method">space</span>(<span class="string">'.'</span>).<span class="method">lower</span>()<span class="block end">}</span>.<span class="block start">{</span><span class="variable">s</span><span class="block end">}</span><span class="block start">{</span><span class="variable">e</span>.<span class="method">pad</span>(<span class="numeral">2</span>)<span class="block end">}</span></code>dark.angel.301
 					</p>
+					<p>
+					<code><span class="block start">{</span><span class="variable">n</span><span class="block end">}</span> (<span class="block start">{</span><span class="variable">y</span><span class="block end">}</span>) (<span class="block start">{</span><span class="string">" CD<span class="variable">$pi</span>"</span><span class="block end">}</span>)</code>The Man from Earth (2007) CD1
+					</p>
+					<p>
+					<code><span class="block start">{</span><span class="variable">n</span><span class="block end">}</span> [<span class="block start">{</span><span class="variable">y</span><span class="block end">}</span>] <span class="block start">{</span><span class="variable">vf</span><span class="block end">}</span> <span class="block start">{</span><span class="variable">af</span><span class="block end">}</span></code>The Man from Earth [2007] 720p 6ch
+					</p>			
 					<h2>Advanced Examples</h2>
 					<p>
+					<code><span class="block start">{</span><span class="variable">n</span>.<span class="method">upperInitial</span>().<span class="method">space</span>(<span class="string">'.'</span>)<span class="block end">}</span>.<span class="block start">{</span><span class="variable">y</span><span class="block end">}</span>.<span class="block start">{</span><span class="variable">source</span><span class="block end">}</span>.<span class="block start">{</span><span class="variable">vc</span><span class="block end">}</span>-<span class="block start">{</span><span class="variable">group</span><span class="block end">}</span></code>The.Man.From.Earth.2007.DVDRip.XviD-ALLiANCE
+					</p>
+					<p>
 					<code><span class="block start">{</span><span class="variable">n</span>.<span class="method">space</span>(<span class="string">'_'</span>)<span class="block end">}</span>_-_<span class="block start">{</span><span class="variable">e</span>.<span class="method">pad</span>(<span class="numeral">2</span>)<span class="block end">}</span>_[<span class="block start">{</span><span class="variable">resolution</span><span class="block end">}</span>_<span class="block start">{</span><span class="variable">vc</span><span class="block end">}</span>_<span class="block start">{</span><span class="variable">ac</span><span class="block end">}</span>][<span class="block start">{</span><span class="variable">crc32</span><span class="block end">}</span>]</code>Juuni_Kokuki_-_01_[1280x720_XviD_MP3][3E16AF40]
 					</p>
 					<p>
@@ -92,7 +98,7 @@
 					<code><span class="block start">{</span><span class="variable">n</span><span class="block end">}</span> [<span class="block start">{</span><span class="variable">airdate</span>.<span class="method">format</span>(<span class="string">'yyyy.MM.dd'</span>)<span class="block end">}</span>] <span class="block start">{</span><span class="variable">t</span><span class="block end">}</span></code>The Daily Show [2010.01.05] George Lucas
 					</p>					
 					<p>
-					<code>E:/Complete/<span class="block start">{</span><span class="variable">n</span><span class="block end">}</span><span class="block start">{</span><span class="string">'/Season '</span>+<span class="variable">s</span><span class="block end">}</span>/<span class="block start">{</span><span class="variable">s</span>+<span class="string">'x'</span><span class="block end">}</span><span class="block start">{</span><span class="variable">e</span>.<span class="method">pad</span>(<span class="numeral">2</span>)<span class="block end">}</span> - <span class="block start">{</span><span class="variable">t</span><span class="block end">}</span></code>Rename and move. The directory structure is completely up to you.
+					<code>E:/Complete/<span class="block start">{</span><span class="variable">n</span><span class="block end">}</span><span class="block start">{</span><span class="string">'/Season '</span>+<span class="variable">s</span><span class="block end">}</span>/<span class="block start">{</span><span class="variable">s</span>+<span class="string">'x'</span><span class="block end">}</span><span class="block start">{</span><span class="variable">e</span>.<span class="method">pad</span>(<span class="numeral">2</span>)<span class="block end">}</span> - <span class="block start">{</span><span class="variable">t</span><span class="block end">}</span></code>Rename and <b>move</b> files. The directory structure is completely up to you.
 					</p>
 					<p>
 					<code><span class="block start">{</span><span class="variable">n</span>.<span class="method">replaceTrailingBraces</span>()<span class="block end">}</span> - <span class="block start">{</span><span class="variable">s</span>+<span class="string">'x'</span><span class="block end">}</span><span class="block start">{</span><span class="variable">e</span>.<span class="method">pad</span>(<span class="numeral">2</span>)<span class="block end">}</span> - <span class="block start">{</span><span class="variable">t</span>.<span class="method">replaceAll</span>(<span class="regex">/[!?.]+$/</span>).<span class="method">replaceAll</span>(<span class="regex">/[`´]/</span>, <span class="string">"'"</span>).<span class="method">lowerTrail</span>().<span class="method">replacePart</span>(<span class="string">', Part $1'</span>)<span class="block end">}</span></code>My personal favorite. Pretty much 1x01, but with lots of cleanup operations.
@@ -100,7 +106,7 @@
 					
 					<h2 class="reference">
 						Binding Reference
-						<a href="http://filebot.svn.sourceforge.net/viewvc/filebot/trunk/source/net/sourceforge/filebot/format/EpisodeBindingBean.java?view=markup" class="source" onclick="_gaq.push(['_trackPageview', '/source/EpisodeBindingBean.java'])" target="_blank">source</a>
+						<a href="http://filebot.svn.sourceforge.net/viewvc/filebot/trunk/source/net/sourceforge/filebot/format/MediaBindingBean.java?view=markup" class="source" onclick="_gaq.push(['_trackPageview', '/source/EpisodeBindingBean.java'])" target="_blank">source</a>
 					</h2>
 					<table class="reference binding">
 						<tr>
@@ -143,6 +149,11 @@
 							<td>special epsiode number</td>
 							<td>1</td>
 						</tr>
+						<tr>
+							<td>imdb</td>
+							<td>imdb id</td>
+							<td>0756683</td>
+						</tr>
 						<tr>
 							<td>vc</td>
 							<td>video codec</td>
@@ -163,11 +174,26 @@
 							<td>video format</td>
 							<td>720p</td>
 						</tr>
+						<tr>
+							<td>af</td>
+							<td>audio channels</td>
+							<td>6ch</td>
+						</tr>
 						<tr>
 							<td>resolution</td>
 							<td>video size</td>
 							<td>1280x720</td>
 						</tr>
+						<tr>
+							<td>source</td>
+							<td>source medium</td>
+							<td>BluRay</td>
+						</tr>
+						<tr>
+							<td>group</td>
+							<td><a href="http://sourceforge.net/projects/filebot/forums/forum/723389/topic/4713917" target="_blank">release group</a></td>
+							<td>ALLiANCE</td>
+						</tr>
 						<tr>
 							<td>crc32</td>
 							<td>crc32 checksum</td>
@@ -186,13 +212,28 @@
 						<tr>
 							<td>episode</td>
 							<td>episode object</td>
-							<td>&lt;default name&gt;</td>
+							<td>&lt;default episode name&gt;</td>
+						</tr>
+						<tr>
+							<td>movie</td>
+							<td>movie object</td>
+							<td>&lt;default movie name&gt;</td>
+						</tr>						
+						<tr>
+							<td>pi</td>
+							<td>part index</td>
+							<td>1</td>
+						</tr>
+						<tr>
+							<td>pn</td>
+							<td>number of parts</td>
+							<td>2</td>
 						</tr>
 						<tr>
 							<td>file</td>
 							<td>file object</td>
 							<td>&lt;file path&gt;</td>
-						</tr>						
+						</tr>
 						<tr>
 							<td>media</td>
 							<td>general media info object</td>