diff --git a/snippets/javascript.snippets b/snippets/javascript.snippets
index fedb943df..961e691bc 100644
--- a/snippets/javascript.snippets
+++ b/snippets/javascript.snippets
@@ -1,3 +1,6 @@
+# Node magic number
+snippet #!
+	#!/usr/bin/env node
 # Prototype
 snippet proto
 	${1:class_name}.prototype.${2:method_name} =
@@ -11,9 +14,9 @@ snippet fun
 	}
 # Anonymous Function
 snippet f
-	function (${1}) {
-		${3}
-	}${2:;}
+	function(${1}) {
+		${2:// body...}
+	}${3:;}
 # Immediate function
 snippet (f
 	(function (${1}) {
@@ -23,14 +26,14 @@ snippet (f
 snippet if
 	if (${1:true}) {
 		${2}
-	}
+	}${3}
 # if ... else
 snippet ife
 	if (${1:true}) {
 		${2}
 	} else {
 		${3}
-	}
+	} ${4}
 # tertiary conditional
 snippet ter
 	${1:/* condition */} ? ${2:a} : ${3:b}
@@ -52,8 +55,8 @@ snippet case
 	${3}
 # for (...) {...}
 snippet for
-	for (var ${2:i} = 0, l = ${1:arr}.length; $2 < l; $2 ++) {
-		var ${3:v} = $1[$2];${4:}
+	for (var ${1:i} = 0; $1 < ${2:n}; $1 ++) {
+		${3:// body}
 	}
 # for (...) {...} (Improved Native For-Loop)
 snippet forr
@@ -96,7 +99,7 @@ snippet cl
 	console.log(${1});
 # return
 snippet ret
-	return ${1:result}
+	return ${1:result};${2}
 # for (property in object ) { ... }
 snippet fori
 	for (var ${1:prop} in ${2:Things}) {
diff --git a/snippets/lua.snippets b/snippets/lua.snippets
index 34ae25eb6..2b5464b8f 100644
--- a/snippets/lua.snippets
+++ b/snippets/lua.snippets
@@ -1,10 +1,17 @@
 snippet #!
 	#!/usr/bin/env lua
 	$1
-snippet local
-	local ${1:x} = ${2:1}
+snippet loc
+	local ${1:var} = ${2:1}
+snippet if
+	if ${1:condition} then
+		${2:-- body}
+	end${3}
+snippet elseif
+	elseif (${1:condition}) then
+		${2:-- body}
 snippet fun
-	function ${1:fname}(${2:...})
+	function ${1:name}(${2:...})
 		${3:-- body}
 	end
 snippet for
@@ -12,7 +19,7 @@ snippet for
 		${4:print(i)}
 	end
 snippet forp
-	for ${1:i},${2:v} in pairs(${3:table_name}) do
+	for ${1:k},${2:v} in pairs(${3:table}) do
 	   ${4:-- body}
 	end
 snippet fori