diff --git a/cookies.sh b/cookies.sh
index 4246405..66bc302 100644
--- a/cookies.sh
+++ b/cookies.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 
 getCookie() {
-	key="$1"
+	local key="$1"
 	echo "$HTTP_COOKIE" | tr ';' $'\n' | grep -e "^$1=" | cut -d= -f2 | sed -r 's/\s*$//g' 
 }
 
 setCookie() {
-	key="$1"
-	value="$2"
-	attributes="$3"
+	local key="$1"
+	local value="$2"
+	local attributes="$3"
 	header "Set-Cookie" "$key=$value; $attributes"
 }
diff --git a/mysql.sh b/mysql.sh
index 48a6c6a..3f0fdbe 100644
--- a/mysql.sh
+++ b/mysql.sh
@@ -26,16 +26,15 @@ query() {
 
 escape() {
 	echo "$1" |
-		sed "s/\\/\\\\/g" |
+		sed 's/\\/\\\\/g' |
 		sed "s/'/\\'/g" |
-		sed "s/\"/\\\"/g" |
-		sed "s/\n/\\n/g" |
-		sed "s/\r/\\r/g" |
-		sed "s/\t/\\t/g" |
-		sed "s/\Z/\\Z/g" |
-		sed "s/\b/\\b/g" |
-		sed "s/%/\\%/g" |
-		sed "s/_/\\_/g"
+		sed 's/\"/\\\"/g' |
+		sed 's/\n/\\n/g' |
+		sed 's/\r/\\r/g' |
+		sed 's/\t/\\t/g' |
+		sed 's/\Z/\\Z/g' |
+		sed 's/%/\\%/g' |
+		sed 's/_/\\_/g'
 }
 
 getColumns() {
diff --git a/router.sh b/router.sh
index 978de0d..b15abc7 100644
--- a/router.sh
+++ b/router.sh
@@ -20,8 +20,8 @@ _default404() {
 }
 
 _matchPaths() {
-	actual="$1"
-	search="$2"
+	local actual="$1"
+	local search="$2"
 
 	# TODO: add wildcards
 	test "$actual" = "$search"
diff --git a/sessions.sh b/sessions.sh
index 4de1aa9..8b00cbf 100644
--- a/sessions.sh
+++ b/sessions.sh
@@ -32,8 +32,8 @@ _getSession() {
 }
 
 _newSessionId() {
-	base="$(date -Ins -u)"
-	random="$RANDOM"
+	local base="$(date -Ins -u)"
+	local random="$RANDOM"
 	while _getSession "$(echo "$base$random" | md5sum | cut -d' ' -f1)" > /dev/null; do
 		random="$RANDOM"
 	done
diff --git a/shinden b/shinden
index 6b398f2..0964fdc 160000
--- a/shinden
+++ b/shinden
@@ -1 +1 @@
-Subproject commit 6b398f25719243c102f7a91972966538ed23dd01
+Subproject commit 0964fdc24ff68d84f419354f227b12cb9ff27df3
diff --git a/uri.sh b/uri.sh
index a313ef5..d503aa7 100644
--- a/uri.sh
+++ b/uri.sh
@@ -17,6 +17,12 @@ queryString() {
 
 _formData=""
 
+cacheFormData() {
+	if test -z "$_formData"; then
+		_formData="$(cat)"
+	fi
+}
+
 formData() {
 	if test -z "$_formData"; then
 		_formData="$(cat)"
diff --git a/utils.sh b/utils.sh
index 060dea1..4d64dd5 100644
--- a/utils.sh
+++ b/utils.sh
@@ -4,7 +4,7 @@ _hasStatus=0
 
 status() {
 	_hasStatus=1
-	status="$1"
+	local status="$1"
 	echo -n "Status: $status "
 	case "$status" in
 		100) echo "Continue" ;;