diff --git a/conf/icecast.xml.in b/conf/icecast.xml.in
index 379d80b2..14229551 100644
--- a/conf/icecast.xml.in
+++ b/conf/icecast.xml.in
@@ -11,24 +11,29 @@
     <location>Earth</location>
     <!-- If you are listing streams on a YP, this MUST be a working email! -->
     <admin>icemaster@localhost</admin>
+    <!-- This is the hostname other people will use to connect to your server.
+         It affects mainly the urls generated by Icecast for playlists and YP
+         listings. You MUST configure it properly for YP listings to work!
+         This is NOT your homepage address, it's the hostname for THIS server.
+    -->
+    <hostname>localhost</hostname>
 
     <limits>
+        <!-- Global maximum number of clients.
+             This includes all kinds of clients, not only listeners.
+        -->
         <clients>100</clients>
         <sources>2</sources>
         <queue-size>524288</queue-size>
         <client-timeout>30</client-timeout>
         <header-timeout>15</header-timeout>
         <source-timeout>10</source-timeout>
-        <!-- If enabled, this will provide a burst of data when a client
-             first connects, thereby significantly reducing the startup
-             time for listeners that do substantial buffering. However,
-             it also significantly increases latency between the source
-             client and listening client.  For low-latency setups, you
-             might want to disable this. -->
-        <burst-on-connect>1</burst-on-connect>
-        <!-- same as burst-on-connect, but this allows for being more
-             specific on how much to burst. Most people won't need to
-             change from the default 64k. Applies to all mountpoints  -->
+        <!-- This sets the burst size in [bytes]. This is the amount the
+             the server sends to a listener that connects to a stream.
+             This allows for a significantly reducing in startup time.
+             Most people won't need to change from the default 64k.
+             Applies to all mountpoints.
+        -->
         <burst-size>65535</burst-size>
     </limits>
 
@@ -60,13 +65,6 @@
     </directory>
     -->
 
-    <!-- This is the hostname other people will use to connect to your server.
-         It affects mainly the urls generated by Icecast for playlists and YP
-         listings. You MUST configure it properly for YP listings to work!
-         This is NOT your homepage address, it's the hostname for THIS server.
-    -->
-    <hostname>localhost</hostname>
-
     <!-- You may have multiple <listen-socket> elements -->
     <listen-socket>
         <port>8000</port>
@@ -103,10 +101,12 @@
          You don't need this if you only have one server.
          Please refer to the documentation for a detailed explanation.
     -->
-    <!--<master-server>127.0.0.1</master-server>-->
-    <!--<master-server-port>8001</master-server-port>-->
-    <!--<master-update-interval>120</master-update-interval>-->
-    <!--<master-password>hackme</master-password>-->
+    <!--
+    <master-server>127.0.0.1</master-server>
+    <master-server-port>8001</master-server-port>
+    <master-update-interval>120</master-update-interval>
+    <master-password>hackme</master-password>
+    -->
 
     <!-- Setting this makes all relays on-demand unless overridden, this is
          useful for master relays which do not have <relay> definitions here.
@@ -130,7 +130,7 @@
          Only define <mount> sections if you want to use advanced options,
          like alternative usernames or passwords
          All <mount> sections below are disabled by default,
-         to activate them remove the comment markers around them and restart.
+         to activate them remove the comment markers around them and reload.
     -->
 
     <!-- Default settings for all mounts that don't have a specific <mount type="normal">.