diff --git a/lib/fog/aws/models/ec2/address.rb b/lib/fog/aws/models/ec2/address.rb
index ba32e3f4c..da383b490 100644
--- a/lib/fog/aws/models/ec2/address.rb
+++ b/lib/fog/aws/models/ec2/address.rb
@@ -5,7 +5,7 @@ module Fog
       class Address < Fog::Model
 
         attr_accessor :instance_id,
-          :public_ip
+                      :public_ip
 
         def initialize(attributes = {})
           remap_attributes(attributes, {
diff --git a/lib/fog/aws/models/ec2/addresses.rb b/lib/fog/aws/models/ec2/addresses.rb
index 200493032..ae67bcd2e 100644
--- a/lib/fog/aws/models/ec2/addresses.rb
+++ b/lib/fog/aws/models/ec2/addresses.rb
@@ -8,8 +8,8 @@ module Fog
 
       class Addresses < Fog::Collection
 
-        def all
-          data = connection.describe_addresses.body
+        def all(public_ip = [])
+          data = connection.describe_addresses(public_ip).body
           addresses = []
           data['addressesSet'].each do |address|
             addresses << Fog::AWS::EC2::Address.new({
diff --git a/lib/fog/aws/models/ec2/key_pair.rb b/lib/fog/aws/models/ec2/key_pair.rb
index bd3084f9f..f282ce24a 100644
--- a/lib/fog/aws/models/ec2/key_pair.rb
+++ b/lib/fog/aws/models/ec2/key_pair.rb
@@ -5,8 +5,8 @@ module Fog
       class KeyPair < Fog::Model
 
         attr_accessor :fingerprint,
-          :material,
-          :name
+                      :material,
+                      :name
 
         def initialize(attributes = {})
           remap_attributes(attributes, {
diff --git a/lib/fog/aws/models/ec2/key_pairs.rb b/lib/fog/aws/models/ec2/key_pairs.rb
index e3b65fed9..4deeec700 100644
--- a/lib/fog/aws/models/ec2/key_pairs.rb
+++ b/lib/fog/aws/models/ec2/key_pairs.rb
@@ -8,8 +8,8 @@ module Fog
 
       class KeyPairs < Fog::Collection
 
-        def all(key_names = [])
-          data = connection.describe_key_pairs(key_names).body
+        def all(key_name = [])
+          data = connection.describe_key_pairs(key_name).body
           key_pairs = []
           data['keySet'].each do |key|
             key_pairs << Fog::AWS::EC2::KeyPair.new({
diff --git a/lib/fog/aws/models/ec2/volume.rb b/lib/fog/aws/models/ec2/volume.rb
index bb4cf5105..dd5326f97 100644
--- a/lib/fog/aws/models/ec2/volume.rb
+++ b/lib/fog/aws/models/ec2/volume.rb
@@ -5,13 +5,13 @@ module Fog
       class Volume < Fog::Model
 
         attr_accessor :attachment_time,
-          :availability_zone,
-          :device,
-          :instance_id
-          :size,
-          :snapshot_id,
-          :status,
-          :volume_id
+                      :availability_zone,
+                      :device,
+                      :instance_id
+                      :size,
+                      :snapshot_id,
+                      :status,
+                      :volume_id
         
         def initialize(attributes = {})
           if attributes['attachmentSet']
diff --git a/lib/fog/aws/models/ec2/volumes.rb b/lib/fog/aws/models/ec2/volumes.rb
index 7febc6585..7bccaeac5 100644
--- a/lib/fog/aws/models/ec2/volumes.rb
+++ b/lib/fog/aws/models/ec2/volumes.rb
@@ -8,8 +8,8 @@ module Fog
 
       class Volumes < Fog::Collection
 
-        def all(volume_ids = [])
-          data = connection.describe_volumes(volume_ids)
+        def all(volume_id = [])
+          data = connection.describe_volumes(volume_id)
           volumes = []
           data['volumeSet'].each do |volume|
             volumes << Fog::AWS::EC2::Volume.new({