diff --git a/Shorewall/accounting b/Shorewall/accounting
index 242aa9a0f..2e9f5998c 100755
--- a/Shorewall/accounting
+++ b/Shorewall/accounting
@@ -29,7 +29,8 @@
 #	CHAIN column is not empty then Shorewall will add a jump from the
 #	newly-created chain to the chain named in the NEXT CHAIN column.
 #	
-#ACTION		CHAIN		NEXT CHAIN	
+#ACTION		CHAIN		NEXT
+#				CHAIN	
 
 # ADD YOUR CHAIN DECLARATIONS ABOVE THIS LINE
 #
@@ -77,6 +78,7 @@
 #	Please see http://shorewall.net/Accounting.html for examples and 
 #	additional information about how to use this file.
 #
-#ACTION	SOURCE		DESTINATION	PROTOCOL	DEST PORT   SOURCE PORT
+#ACTION	SOURCE		DESTINATION	PROTOCOL	DEST	SOURCE
+#							PORT	PORT
 #
 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
diff --git a/Shorewall/nat b/Shorewall/nat
index 4c0db0cf7..b56c938ca 100755
--- a/Shorewall/nat
+++ b/Shorewall/nat
@@ -32,5 +32,6 @@
 #                       Yes or yes, NAT will be effective from the firewall
 #                       system
 ##############################################################################
-#EXTERNAL	INTERFACE	INTERNAL	ALL INTERFACES 		LOCAL
+#EXTERNAL	INTERFACE	INTERNAL	ALL	 		LOCAL
+#						INTERFACES
 #LAST LINE -- ADD YOUR ENTRIES ABOVE THIS LINE -- DO NOT REMOVE
diff --git a/Shorewall/policy b/Shorewall/policy
index 68a90846f..023a1d9f2 100644
--- a/Shorewall/policy
+++ b/Shorewall/policy
@@ -71,7 +71,8 @@
 #	d) All other connection requests are rejected and logged at level
 #	   KERNEL.INFO.
 ###############################################################################
-#SOURCE		DEST		POLICY		LOG LEVEL	LIMIT:BURST
+#SOURCE		DEST		POLICY		LOG		LIMIT:BURST
+#						LEVEL
 loc		net		ACCEPT
 net		all		DROP		info
 #
diff --git a/Shorewall/tcrules b/Shorewall/tcrules
index 32215538c..7ae8f7d7a 100755
--- a/Shorewall/tcrules
+++ b/Shorewall/tcrules
@@ -58,5 +58,6 @@
 #			separated list of port names, port numbers or port
 #			ranges.
 ##############################################################################
-#MARK		SOURCE 		DEST		PROTO	PORT(S)	CLIENT PORT(S)
+#MARK		SOURCE 		DEST		PROTO	PORT(S)	CLIENT
+#								PORT(S)
 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE
diff --git a/Shorewall/tunnels b/Shorewall/tunnels
index 9e4f259a3..742a2246a 100644
--- a/Shorewall/tunnels
+++ b/Shorewall/tunnels
@@ -100,5 +100,6 @@
 #
 #			generic:udp:4444	net	4.3.99.124
 #
-# TYPE			ZONE	GATEWAY		GATEWAY ZONE
+# TYPE			ZONE	GATEWAY		GATEWAY
+#						ZONE
 #LAST LINE -- ADD YOUR ENTRIES BEFORE THIS ONE -- DO NOT REMOVE