diff --git a/Rakefile b/Rakefile
index 3ba1a32..e472112 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,5 +1,12 @@
 require 'rake'
 
+require 'puppet-lint/tasks/puppet-lint'
+PuppetLint.configuration.fail_on_warnings = true
+PuppetLint.configuration.send('disable_80chars')
+PuppetLint.configuration.send('disable_autoloader_layout')
+PuppetLint.configuration.send('disable_class_inherits_from_params_class')
+PuppetLint.configuration.send('disable_class_parameter_defaults')
+
 task :default => [:spec]
 
 desc "Run all module spec tests (Requires rspec-puppet gem)"
diff --git a/manifests/mod/python.pp b/manifests/mod/python.pp
index fb536e6..3b01360 100644
--- a/manifests/mod/python.pp
+++ b/manifests/mod/python.pp
@@ -1,3 +1,16 @@
+# Class: apache::mod::python
+#
+# This class installs Python for Apache
+#
+# Parameters:
+#
+# Actions:
+# - Install Apache Python package
+#
+# Requires:
+#
+# Sample Usage:
+#
 class apache::mod::python {
   include apache
 
diff --git a/manifests/mod/wsgi.pp b/manifests/mod/wsgi.pp
index 28b15ca..81463b9 100644
--- a/manifests/mod/wsgi.pp
+++ b/manifests/mod/wsgi.pp
@@ -1,3 +1,16 @@
+# Class: apache::mod::wsgi
+#
+# This class installs wsgi for Apache
+#
+# Parameters:
+#
+# Actions:
+# - Install Apache wsgi package
+#
+# Requires:
+#
+# Sample Usage:
+#
 class apache::mod::wsgi {
   include apache
 
diff --git a/manifests/vhost.pp b/manifests/vhost.pp
index a918907..6ff5859 100644
--- a/manifests/vhost.pp
+++ b/manifests/vhost.pp
@@ -77,9 +77,9 @@ define apache::vhost(
   }
 
   if $configure_firewall {
-    if ! defined(Firewall["0100-INPUT ACCEPT $port"]) {
+    if ! defined(Firewall["0100-INPUT ACCEPT ${port}"]) {
       @firewall {
-        "0100-INPUT ACCEPT $port":
+        "0100-INPUT ACCEPT ${port}":
           action => 'accept',
           dport  => '$port',
           proto  => 'tcp'
diff --git a/manifests/vhost/redirect.pp b/manifests/vhost/redirect.pp
index 17c6c65..688d413 100644
--- a/manifests/vhost/redirect.pp
+++ b/manifests/vhost/redirect.pp
@@ -40,9 +40,9 @@ define apache::vhost::redirect (
     notify  => Service['httpd'],
   }
 
-  if ! defined(Firewall["0100-INPUT ACCEPT $port"]) {
+  if ! defined(Firewall["0100-INPUT ACCEPT ${port}"]) {
     @firewall {
-      "0100-INPUT ACCEPT $port":
+      "0100-INPUT ACCEPT ${port}":
         jump  => 'ACCEPT',
         dport => '$port',
         proto => 'tcp'