diff --git a/snippets/puppet.snippets b/snippets/puppet.snippets
index a4fdf19..8b0a410 100644
--- a/snippets/puppet.snippets
+++ b/snippets/puppet.snippets
@@ -90,7 +90,7 @@ snippet class
 		${0}
 	}
 snippet node
-	node '${1:`vim_snippets#Filename('', 'fqdn')`}' {
+	node "${1:`vim_snippets#Filename('', 'fqdn')`}" {
 		${0}
 	}
 snippet case
@@ -107,13 +107,21 @@ snippet if
 	if $${1:variable} {
 		${0}
 	}
+snippet ifd
+	if defined(${1:Resource}["${2:name}"]) {
+		${0}
+	}
+snippet ifnd
+	if !defined(${1:Resource}["${2:name}"]) {
+		${0}
+	}
 snippet el
 	else {
 		${0}
 	}
 snippet ?
 	? {
-		'${1}'	=> ${0}
+		"${1}"	=> ${0}
 	  }
 #
 # blocks etc and general syntax sugar
@@ -122,98 +130,98 @@ snippet [
 snippet >
 	${1}	=> ${0}
 snippet p:
-	'puppet://puppet/${1:module name}/${0:file name}'
+	"puppet://puppet/${1:module name}/${0:file name}"
 #
 # Functions
 snippet alert
-	alert('${1:message}')
+	alert("${1:message}")
 snippet crit
-	crit('${1:message}')
+	crit("${1:message}")
 snippet debug
-	debug('${1:message}')
+	debug("${1:message}")
 snippet defined
-	defined(${1:Resource}['${2:name}'])
+	defined(${1:Resource}["${2:name}"])
 snippet emerg
-	emerg('${1:message}')
+	emerg("${1:message}")
 snippet extlookup Simple extlookup
-	extlookup('${1:variable}')
+	extlookup("${1:variable}")
 snippet extlookup Extlookup with defaults
-	extlookup('${1:variable}', '${2:default}')
+	extlookup("${1:variable}", "${2:default}")
 snippet extlookup Extlookup with defaults and custom data file
-	extlookup('${1:variable}', '${2:default}', '${3:data source}')
+	extlookup("${1:variable}", "${2:default}", "${3:data source}")
 snippet fail
-	fail('${1:message}')
+	fail("${1:message}")
 snippet info
-	info('${1:message}')
+	info("${1:message}")
 snippet inline_template
-	inline_template('<%= ${1} %>')
+	inline_template("<%= ${1} %>")
 snippet notice
-	notice('${1:message}')
+	notice("${1:message}")
 snippet realize
 	realize(${1:Resource}[${2:name}])
 snippet regsubst
-	regsubst(${1:hay stack}, ${2:needle}, '${3:replacement}')
+	regsubst(${1:hay stack}, ${2:needle}, "${3:replacement}")
 snippet inc
 	include ${1:classname}
 snippet split
-	split(${1:hay stack}, '${2:patten}')
+	split(${1:hay stack}, "${2:patten}")
 snippet versioncmp
-	versioncmp('${1:version}', '${2:version}')
+	versioncmp("${1:version}", "${2:version}")
 snippet warning
-	warning('${1:message}')
+	warning("${1:message}")
 #
 # Types
 snippet cron
-	cron { '${1:name}':
-		command => '${2}',
-		user    => '${3:root}',
+	cron { "${1:name}":
+		command => "${2}",
+		user    => "${3:root}",
 		${4}    => ${0},
 	}
 
 snippet exec
-	exec { '${1:name}':
-		command => '${2:$1}',
-		user    => '${3:root}',
+	exec { "${1:name}":
+		command => "${2:$1}",
+		user    => "${3:root}",
 		${4}    => ${0},
 	}
 
 snippet user
-	user { '${1:user}':
+	user { "${1:user}":
 		ensure      => present,
-		comment     => '${2:$1}',
+		comment     => "${2:$1}",
 		managehome  => true,
-		home        => '${0:/home/$1}',
+		home        => "${0:/home/$1}",
 	}
 
 snippet group
-	group { '${1:group}':
+	group { "${1:group}":
 		ensure => ${0:present},
 	}
 
 snippet host
-	host { '${1:hostname}':
+	host { "${1:hostname}":
 		ip => ${0:127.0.0.1},
 	}
 
 snippet mailalias
-	mailalias { '${1:localpart}':
-		recipient => '${0:recipient}',
+	mailalias { "${1:localpart}":
+		recipient => "${0:recipient}",
 	}
 
 snippet mount
-	mount { '${1:destination path}':
+	mount { "${1:destination path}":
 		ensure	=> ${2:mounted},
-		device	=> '${0:device name or path}',
+		device	=> "${0:device name or path}",
 	}
 
 snippet package
-	package { '${1:package name}':
+	package { "${1:package name}":
 		ensure	=> ${0:present},
 	}
 
 snippet yumrepo
-	yumrepo { '${1:repo name}':
-		Descr   => '${2:$1}',
+	yumrepo { "${1:repo name}":
+		Descr   => "${2:$1}",
 		enabled => ${0:1},
 	}
 
@@ -223,22 +231,39 @@ snippet define
 	}
 
 snippet service
-	service { '${1:service}' :
+	service { "${1:service}" :
 		ensure    => running,
 		enable    => true,
-		require   => [ Package['${2:package}'], File['${3:file}'], ],
-		subscribe => [ File['${4:configfile1}'], File['${5:configfile2}'], Package['${6:package}'], ],
+		require   => [ Package["${2:package}"], File["${3:file}"], ],
+		subscribe => [ File["${4:configfile1}"], File["${5:configfile2}"], Package["${6:package}"], ],
 	}
 
 snippet file
-	file { '${1:filename}' :
+	file { "${1:filename}" :
 		ensure  => ${2:present},
-		owner   => '${3:root}',
-		group   => '${4:root}',
-		mode    => '${5:0644}',
-		source  => 'puppet:///modules/${6:module}/${7:source}',
-		content => template('/etc/puppet/templates/${8:template}'),
-		alias   => '${9:alias}',
-		require => [ Package['${10:package}'], File['${11:file}'], ],
+		owner   => "${3:root}",
+		group   => "${4:root}",
+		mode    => "${5:0644}",
+		source  => "puppet:///modules/${6:module}/${7:source}",
+		content => template("${8:module}/${9:template}"),
+		alias   => "${10:alias}",
+		require => [ Package["${11:package}"], File["${12:file}"], ],
+	}
+
+snippet archive
+	archive { "${1:filename}" :
+		ensure     => ${2:present},
+		url        => "http://${3:url}",
+		extension  => "${4:tgz}",
+		target     => "${5:target}",
+		checksum   => ${6:false},
+		src_target => "${7:/tmp}",
+	}
+
+snippet firewall
+	firewall { "${1:comment}" :
+		proto	=> ${2:tcp},
+		action	=> ${3:accept},
+		port	=> ${4},
 	}