diff --git a/samples/bip.conf b/samples/bip.conf
index e3d6688..1777010 100644
--- a/samples/bip.conf
+++ b/samples/bip.conf
@@ -68,7 +68,7 @@
 
 # Log format allows you to make log filenames depend on the log line's
 # attributes. Here's a list :
-# %u -> user name
+# %u -> username
 # %n -> network name
 # %Y -> 4 digit year
 # %m -> 2 digit month
@@ -113,15 +113,14 @@
 #    the server where bip is running. In your client setup server password to:
 #      username:password:connectionname
 #  - do not store the password in clear here, use the bipmkpw util to generate
-# a hash
+#    a hash
 
 # User structure is grouping information for a given user
 #user {
-	# The name in bip of the user
-	# This is used by bip only
+	# The name in bip of the user, required. This is used by bip only.
 	#name = ;
 	# This user's password (md5(md5("tata"))) with seed - generated by
-	# bipmkpw, for example: "3880f2b39b3b9cb507b052b695d2680859bfc327"
+	# bipmkpw, for example: "3880f2b39b3b9cb507b052b695d2680859bfc327".
 	#password = ;
 
 	# Set this to true if you want this user to have admin privileges on
@@ -184,9 +183,9 @@
 	
 	# If blreset_on_talk talking on an irc network has the same effect of
 	# issuing /bip blreset <current window>, meaning that stuffed logged
-	# before the command won't be read back on backlog
+	# before the command won't be read back on backlog.
 	#backlog_reset_on_talk = false;
-	#
+
 	# If you have backlog_reset_on_talk set to true, talking in a query
 	# will reset the backlog for the query. Same goes for channel. With the
 	# following option set to true, talking in a connection will reset the
@@ -195,7 +194,7 @@
 	
 	# If bl_msg_only is true, only channel and private messages will be
 	# backlogged upon the reconnection of a client. Default is false, thus
-	# joins, parts, quits, nick changes, topic changes, ... are backlogged
+	# joins, parts, quits, nick changes, topic changes, ... are backlogged.
 	#backlog_msg_only = false;