diff --git a/www.i2p2/pages/i2pcontrol.html b/www.i2p2/pages/i2pcontrol.html
index 6bf046b0..46bc8387 100644
--- a/www.i2p2/pages/i2pcontrol.html
+++ b/www.i2p2/pages/i2pcontrol.html
@@ -15,115 +15,87 @@ Parameters are only provided in a named way (maps).
 <h4>JSON-RPC 2 format</h4>
 <div class="box" style="clear: none;"><pre>
 Request:
-{"id":"id", "method":"method-name","params":{"param-key-1":"param-value-1", "param-key-2":"param-value-2", "token":"**actual token**"}, "jsonrpc":"2.0"}
+{"id":"id", "method":"Method-name","params":{"Param-key-1":"param-value-1", "Param-key-2":"param-value-2", "Token":"**actual token**"}, "jsonrpc":"2.0"}
 Response:
-{"id":"id","result":{"result-key-1":"result-value-1","result-key-2":"result-value-2"},"jsonrpc":"2.0"}
+{"id":"id","result":{"Result-key-1":"result-value-1","Result-key-2":"result-value-2"},"jsonrpc":"2.0"}
 
 </pre></div>
 </p>
 <ul>method-name &ndash; Description
 	<ul>Request
-		<li>param-key-1 &ndash; Description</li>
-		<li>param-key-2 &ndash; Description</li>
-		<li>token &ndash; Token used for authenticating every request (excluding the 'authenticate' request)</li>
+		<li>Param-key-1 &ndash; Description</li>
+		<li>Param-key-2 &ndash; Description</li>
+		<li>Token &ndash; Token used for authenticating every request (excluding the 'Authenticate' RPC method)</li>
 	</ul>
 	<ul>Response
-		<li>result-key-1 &ndash; Description</li>
-		<li>result-key-2 &ndash; Description</li>
+		<li>Result-key-1 &ndash; Description</li>
+		<li>Result-key-2 &ndash; Description</li>
 	</ul>
 </ul>
 
 <h4>Implemented methods</h4>
-<ul>authenticate &ndash; Creates and returns an authentication token used for further communication.
+<ul>Authenticate &ndash; Creates and returns an authentication token used for further communication.
 	<ul>Request
-		<li>password &ndash; [String] The password used for authenticating against the remote server.</li>
+		<li>Password &ndash; [String] The password used for authenticating against the remote server.</li>
 	</ul>
 	<ul>Response
-		<li>token &ndash; [String] The token used for further communication.</li>
+		<li>Token &ndash; [String] The token used for further communication.</li>
 	</ul>
 </ul>
-<ul>echo &ndash; Echoes the value of the echo key, used for debugging and testing.
+<ul>Echo &ndash; Echoes the value of the echo key, used for debugging and testing.
 	<ul>Request
-		<li>echo &ndash; [String] Value will be returned in response.</li>
-		<li>token &ndash; [String]Token used for authenticating the client. Is provided by the server via the 'authenticate' request.</li>
+		<li>Echo &ndash; [String] Value will be returned in response.</li>
+		<li>Token &ndash; [String]Token used for authenticating the client. Is provided by the server via the 'Authenticate' RPC method.</li>
 	</ul>
 	<ul>Response
-		<li>result &ndash; [String] Value of the key 'echo' in the request.</li>
+		<li>Result &ndash; [String] Value of the key 'echo' in the request.</li>
 	</ul>
 </ul>
-<ul>getRate &ndash; Fetches rateStat from router statManager. Creates stat if not already created.
+<ul>GetRate &ndash; Fetches rateStat from router statManager. Creates stat if not already created.
 	<ul>Request
-		<li>rateStat &ndash; [String] Determines which rateStat to fetch, see <a href="ratestats.html">ratestats</a>.</li>
-		<li>period &ndash; [double] Determines which period a stat is fetched for.</li>
-		<li>token &ndash; [String] Token used for authenticating the client. Is provided by the server via the 'authenticate' request.</li>
+		<li>Stat &ndash; [String] Determines which rateStat to fetch, see <a href="ratestats.html">ratestats</a>.</li>
+		<li>Period &ndash; [double] Determines which period a stat is fetched for.</li>
+		<li>Token &ndash; [String] Token used for authenticating the client. Is provided by the server via the 'Authenticate' RPC method.</li>
 	</ul>
 	<ul>Response
-		<li>result &ndash; [double] Returns the average value for the reuested rateStat and period.</li>
+		<li>Result &ndash; [double] Returns the average value for the reuested rateStat and period.</li>
 	</ul>
 </ul>
-<ul>getNetworkInfo &ndash; Fetches various network related information. Ports, addresses etc.
+<ul>NetworkInfo &ndash; Fetches or sets various network related information. Ports, addresses etc.
 	<ul>Request
-		<li>*all &ndash; [value-ignored] Returns all of the below values fetched by the options below.</li>
-		<li>*i2p.router.net.ntcp.port &ndash; [value-ignored] What port is used for the TCP transport.</li>
-		<li>*i2p.router.net.ntcp.hostname &ndash; [value-ignored] What hostname is used for the TCP transport.</li>
-		<li>*i2p.router.net.ntcp.autoip &ndash; [value-ignored] Use automatically detected ip for TCP transport.</li>
-		<li>*i2p.router.net.ssu.port &ndash; [value-ignored] What port is used for the UDP transport.</li>
-		<li>*i2p.router.net.ssu.hostname &ndash; [value-ignored] What hostname is used for the UDP transport.</li>
-		<li>*i2p.router.net.ssu.detectedip &ndash; [value-ignored] What IP address has the UDP transport detected.</li>
-		<li>*i2p.router.net.ssu.autoip &ndash; [value-ignored] Which methods should be used for detecting the ip address of the UDP transport.</li>
-		<li>*i2p.router.net.upnp &ndash; [value-ignored] Is UPNP enabled.</li>
-		<li>*i2p.router.net.bw.share &ndash; [value-ignored] How many percent of bandwidth is usable for participating tunnels.</li>
-		<li>*i2p.router.net.bw.in &ndash; [value-ignored] How many KB/s of inboud bandwidth is allowed.</li>
-		<li>*i2p.router.net.bw.out &ndash; [value-ignored] How many KB/s of outbound bandwidth is allowed.</li>
-		<li>*i2p.router.net.laptopmode &ndash; [value-ignored] Is laptop mode enabled (cChange router identity and UDP port when IP changes ).</li>
-		<li>token &ndash; [String] Token used for authenticating the client. Is provided by the server via the 'authenticate' request.</li>
+		<li>*i2p.router.net.ntcp.port &ndash; [String] What port is used for the TCP transport. If null is submitted, current setting will be returned.</li>
+		<li>*i2p.router.net.ntcp.hostname &ndash; [String] What hostname is used for the TCP transport. If null is submitted, current setting will be returned.</li>
+		<li>*i2p.router.net.ntcp.autoip &ndash; [String] Use automatically detected ip for TCP transport. If null is submitted, current setting will be returned.</li>
+		<li>*i2p.router.net.ssu.port &ndash; [String] What port is used for the UDP transport. If null is submitted, current setting will be returned.</li>
+		<li>*i2p.router.net.ssu.hostname &ndash; [String] What hostname is used for the UDP transport. If null is submitted, current setting will be returned.</li>
+		<li>*i2p.router.net.ssu.autoip &ndash; [String] Which methods should be used for detecting the ip address of the UDP transport. If null is submitted, current setting will be returned.</li>
+		<li>*i2p.router.net.ssu.detectedip &ndash; [null] What ip has been detected by the UDP transport.</li>
+		<li>*i2p.router.net.upnp &ndash; [String] Is UPNP enabled. If null is submitted, current setting will be returned.</li>
+		<li>*i2p.router.net.bw.share &ndash; [String] How many percent of bandwidth is usable for participating tunnels. If null is submitted, current setting will be returned.</li>
+		<li>*i2p.router.net.bw.in &ndash; [String] How many KB/s of inbound bandwidth is allowed. If null is submitted, current setting will be returned.</li>
+		<li>*i2p.router.net.bw.out &ndash; [String] How many KB/s of outbound bandwidth is allowed. If null is submitted, current setting will be returned.</li>
+		<li>*i2p.router.net.laptopmode &ndash; [String] Is laptop mode enabled (change router identity and UDP port when IP changes ). If null is submitted, current setting will be returned.</li>
+		<li>Token &ndash; [String] Token used for authenticating the client. Is provided by the server via the 'Authenticate' RPC method. If null is submitted, current setting will be returned.</li>
 	</ul>
 	<ul>Response
-		<li>i2p.router.net.ntcp.port &ndash; [String] What port is used for the TCP transport.</li>
-		<li>i2p.router.net.ntcp.hostname &ndash; [String] What hostname is used for the TCP transport.</li>
-		<li>i2p.router.net.ntcp.autoip &ndash; [String] Use automatically detected ip for TCP transport.</li>
-		<li>i2p.router.net.ssu.port &ndash; [String] What port is used for the UDP transport.</li>
-		<li>i2p.router.net.ssu.hostname &ndash; [String] What hostname is used for the UDP transport.</li>
-		<li>i2p.router.net.ssu.detectedip &ndash; [String] What IP address has the UDP transport detected.</li>
-		<li>i2p.router.net.ssu.autoip &ndash; [String] Which methods should be used for detecting the ip address of the UDP transport.</li>
-		<li>i2p.router.net.upnp &ndash; [String] Is UPNP enabled.</li>
-		<li>i2p.router.net.bw.share &ndash; [String] How many percent of bandwidth is usable for participating tunnels.</li>
-		<li>i2p.router.net.bw.in &ndash; [String] How many KB/s of inboud bandwidth is allowed.</li>
-		<li>i2p.router.net.bw.out &ndash; [String] How many KB/s of outbound bandwidth is allowed.</li>
-		<li>i2p.router.net.laptopmode &ndash; [String] Is laptop mode enabled (cChange router identity and UDP port when IP changes ).</li>
-	</ul>
-</ul>
-<ul>setNetworkInfo &ndash; Fetches various network related information. Ports, addresses etc.
-	<ul>Request
-		<li>*i2p.router.net.ntcp.port &ndash; [value-ignored] What port is used for the TCP transport.</li>
-		<li>*i2p.router.net.ntcp.hostname &ndash; [value-ignored] What hostname is used for the TCP transport.</li>
-		<li>*i2p.router.net.ntcp.autoip &ndash; [value-ignored] Use automatically detected ip for TCP transport.</li>
-		<li>*i2p.router.net.ssu.port &ndash; [value-ignored] What port is used for the UDP transport.</li>
-		<li>*i2p.router.net.ssu.hostname &ndash; [value-ignored] What hostname is used for the UDP transport.</li>
-		<li>*i2p.router.net.ssu.autoip &ndash; [value-ignored] Which methods should be used for detecting the ip address of the UDP transport.</li>
-		<li>*i2p.router.net.upnp &ndash; [value-ignored] Is UPNP enabled.</li>
-		<li>*i2p.router.net.bw.share &ndash; [value-ignored] How many percent of bandwidth is usable for participating tunnels.</li>
-		<li>*i2p.router.net.bw.in &ndash; [value-ignored] How many KB/s of inboud bandwidth is allowed.</li>
-		<li>*i2p.router.net.bw.out &ndash; [value-ignored] How many KB/s of outbound bandwidth is allowed.</li>
-		<li>*i2p.router.net.laptopmode &ndash; [value-ignored] Is laptop mode enabled (change router identity and UDP port when IP changes ).</li>
-		<li>token &ndash; [String] Token used for authenticating the client. Is provided by the server via the 'authenticate' request.</li>
-	</ul>
-	<ul>Response
-		<li>i2p.router.net.ntcp.port &ndash; [boolean] If the port used for the TCP transport was changed.</li>
-		<li>i2p.router.net.ntcp.hostname &ndash; [boolean] If the hostname is used for the TCP transport was changed.</li>
-		<li>i2p.router.net.ntcp.autoip &ndash; [boolean] If the method for automatically detecting ip for TCP transport was changed.</li>
-		<li>i2p.router.net.ssu.port &ndash; [boolean] If the port is used for the UDP transport was changed.</li>
-		<li>i2p.router.net.ssu.hostname &ndash; [boolean] If the hostname is used for the UDP transport was changed.</li>
-		<li>i2p.router.net.ssu.autoip &ndash; [boolean] If the methods used for detecting the ip address of the UDP transport were changed.</li>
-		<li>i2p.router.net.upnp &ndash; [boolean] If the UPNP setting was changed.</li>
-		<li>i2p.router.net.bw.share &ndash; [boolean] If how many percent of bandwidth is usable for participating tunnels was changed.</li>
-		<li>i2p.router.net.bw.in &ndash; [boolean] If how many KB/s of inboud bandwidth is allowed was changed.</li>
-		<li>i2p.router.net.bw.out &ndash; [boolean] If how many KB/s of outbound bandwidth is allowed was changed.</li>
-		<li>i2p.router.net.laptopmode &ndash; [boolean] If the laptop mode (change router identity and UDP port when IP changes ) was changed.</li>
-		<li>restart.needed &ndash; [boolean] Is a restart needed for the new settings to be used.</li>
+		<li>**i2p.router.net.ntcp.port &ndash; [String] If requested, returns the port used for the TCP transport.</li>
+		<li>**i2p.router.net.ntcp.hostname &ndash; [String] If requested, returns the hostname used for the TCP transport.</li>
+		<li>**i2p.router.net.ntcp.autoip &ndash; [String] If requested, returns the method used for automatically detecting ip for the TCP transport.</li>
+		<li>**i2p.router.net.ssu.port &ndash; [String] If requested, returns the port used for the UDP transport.</li>
+		<li>**i2p.router.net.ssu.hostname &ndash; [String] If requested, returns the hostname used for the UDP transport.</li>
+		<li>**i2p.router.net.ssu.autoip &ndash; [String] If requested, returns methods used for detecting the ip address of the UDP transport.</li>
+		<li>**i2p.router.net.ssu.detectedip &ndash; [String] If requested, returns what ip has been detected by the UDP transport.</li>
+		<li>**i2p.router.net.upnp &ndash; [String] If requested, returns the UPNP setting.</li>
+		<li>**i2p.router.net.bw.share &ndash; [String] If requested, returns how many percent of bandwidth is usable for participating tunnels.</li>
+		<li>**i2p.router.net.bw.in &ndash; [String] If requested, returns how many KB/s of inbound bandwidth is allowed.</li>
+		<li>**i2p.router.net.bw.out &ndash; [String] If requested, returns how many KB/s of outbound bandwidth is allowed.</li>
+		<li>**i2p.router.net.laptopmode &ndash; [String] If requested, returns the laptop mode.</li>
+		<li>SettingsSaved &ndash; [String] Have the provided settings been saved.</li>
+		<li>RestartNeeded &ndash; [String] Is a restart needed for the new settings to be used.</li>
 	</ul>
 </ul>
 <p>* denotes an optional value.</p>
+<p>** denotes a possibly occuring return value</p>