1 files changed, 8 insertions, 3 deletions
diff --git a/lib/oxidized/model/enterasys.rb b/lib/oxidized/model/enterasys.rb
index fb5a501..708d380 100644
--- a/lib/oxidized/model/enterasys.rb
+++ b/lib/oxidized/model/enterasys.rb
@@ -1,20 +1,25 @@
 class Enterasys < Oxidized::Model
 
-  # Enterasys B3 model #
+  # Enterasys B3/C3 models #
 
   prompt /^.+\w\(su\)->\s?$/
 
   comment  '!'
 
   cmd :all do |cfg|
-     cfg.each_line.to_a[1..-2].join
+     cfg.each_line.to_a[2..-3].map{|line|line.delete("\r").rstrip}.join("\n") + "\n"
   end
 
   cmd 'show system hardware' do |cfg|
-    cfg
+    comment cfg
   end
 
   cmd 'show config' do |cfg|
+    cfg.gsub! /^This command shows non-default configurations only./, ''
+    cfg.gsub! /^Use 'show config all' to show both default and non-default configurations./, ''
+    cfg.gsub! /^!|#.*/, ''
+    cfg.gsub! /^$\n/, ''
+
     cfg
   end