diff --git a/gw-action.php b/gw-action.php
index d146484..ae5db6d 100644
--- a/gw-action.php
+++ b/gw-action.php
@@ -3,10 +3,10 @@ $toonid = $_POST['playerid'];
 $action = $_POST['gwaction'];
 if ($action == 1){
 	echo '<body onload="javascript:submitForm()">';
-	echo '<FORM METHOD="POST" ACTION="gw-record.php" NAME="record"><INPUT TYPE="HIDDEN" NAME="playerid" VALUE="'. $toonid . '"><INPUT TYPE="SUBMIT" ID="clkRecord"></FORM>';
+	echo '<FORM METHOD="POST" ACTION="gw-record.php" NAME="record"><INPUT TYPE="HIDDEN" NAME="playerid" VALUE="'. $toonid . '"><INPUT TYPE="SUBMIT" ID="clkRecord"></FORM></BODY>';
 } else if ($action == 2){
 	echo '<body onload="javascript:submitForm()">';
-	echo '<FORM METHOD="POST" ACTION="gw-pull.php" NAME="insert"><INPUT TYPE="HIDDEN" NAME="cname" VALUE="' . $toonid . '"><INPUT TYPE="SUBMIT" ID="clkInsert"></FORM>';
+	echo '<FORM METHOD="POST" ACTION="gw-pull.php" NAME="insert"><INPUT TYPE="HIDDEN" NAME="cname" VALUE="' . $toonid . '"><INPUT TYPE="SUBMIT" ID="clkInsert"></FORM></BODY>';
 } else {
 	echo 'You shouldn\'t be seeing this, something went horribly horribly wrong!';
 }
diff --git a/gw-pull.php b/gw-pull.php
index 0c42c77..3707d16 100644
--- a/gw-pull.php
+++ b/gw-pull.php
@@ -3,7 +3,7 @@
 <?php
 include_once 'gw-connect.php';
 $con = new mysqli(DATABASE_HOST, DATABASE_USER, DATABASE_PASS, DATABASE_NAME);
-$cnameid = mysqli_real_escape_string($con, $_POST['cname']); //need to sanitize & validate this input somehow
+$cnameid = mysqli_real_escape_string($con, $_POST['cnameid']); //need to sanitize & validate this input somehow
 if ($con->connect_errno > 0){
 	die ('Unable to connect to database [' . $db->connect_errno . ']');
 }
diff --git a/gw-record.php b/gw-record.php
index b4fdbc9..d0d7e7a 100644
--- a/gw-record.php
+++ b/gw-record.php
@@ -2,8 +2,8 @@
 <?php
 include_once 'gw-connect.php';
 $con = new mysqli(DATABASE_HOST, DATABASE_USER, DATABASE_PASS, DATABASE_NAME);
-#$toonid = mysqli_real_escape_string($con, $_POST['playerid']); //enable this after character selection is working
-$toonid = '3'; //delete this line after character selection is finished/working
+$toonid = mysqli_real_escape_string($con, $_POST['playerid']); //enable this after character selection is working
+//$toonid = '3'; //delete this line after character selection is finished/working
 #$location = mysqli_real_escape_string($con, $_POST['locationid']); //enable this after location selection is working
 $location = 4; //delete this line after location selection is finished/working
 $whatdropped = mysqli_real_escape_string($con, $_POST['gwdrop']);
diff --git a/gw-toon.php b/gw-toon.php
index 18a402a..386f2b9 100644
--- a/gw-toon.php
+++ b/gw-toon.php
@@ -2,7 +2,13 @@
 include_once 'gw-connect.php';
 $con = new mysqli(DATABASE_HOST, DATABASE_USER, DATABASE_PASS, DATABASE_NAME);
 $userid = 1; //need to actually pull this info from cookie/session (preferable)
-$whattoon = mysqli_real_escape_string($con, $_POST['cname']);
+$whattoon = mysqli_real_escape_string($con, $_POST['cnameid']);
+$nameoftoon = mysqli_real_escape_string($con, $_POST['charactername']);
+if ($toonid == ""){
+	echo '<TITLE>Choose a character!</TITLE><BODY>';
+} else {
+	echo '<TITLE>' . $nameoftoon . '</TITLE></BODY>"';
+}
 if ($con->connect_errno > 0){
 	die ('Unable to connect to database [' . $db->connect_errno . ']');
 }
@@ -18,13 +24,14 @@ if ($whattoon == "0"){
 		$charid = $row['playerid'];
 		$charname = $row['charname'];
 		echo '<OPTION VALUE="' . $charid . '">' . $charname . '</OPTION>';
+		echo '<INPUT TYPE="HIDDEN" NAME="charactername" VALUE="' . $charname . '">';
 	}
 	echo '</SELECT><NOSCRIPT><INPUT TYPE="SUBMIT" VALUE="Choose Toon"></NOSCRIPT></FORM></CENTER>';
 } else {
 	echo '<CENTER><FORM METHOD="POST" ACTION="gw-action.php">';
 	echo '<INPUT TYPE="HIDDEN" NAME="playerid" VALUE=' . $whattoon . '">';
 	echo '<FIELDSET CLASS="radiogroup"><LEGEND>Select your course of action</LEGEND><UL CLASS="radio">';
-	echo '<LI style="text-align:left;">><INPUT TYPE="RADIO" NAME="gwaction" VALUE="1">Record loot info</LI><LI style="text-align:left;">><INPUT TYPE="RADIO" NAME="gwaction" VALUE="2">View Character loot history</LI></UL></FIELDSET>';
-	echo '<INPUT TYPE="SUBMIT" VALUE="Choose action"></FORM><BR /><BR /><FORM METHOD="POST" ACTION="gw-toon.php"><INPUT TYPE="HIDDEN" NAME="cname" VALUE="0"><INPUT TYPE="SUBMIT" VALUE="Return to character selection"></FORM></CENTER>';
+	echo '<LI style="text-align:left;"><INPUT TYPE="RADIO" NAME="gwaction" VALUE="1">Record loot info</LI><LI style="text-align:left;"><INPUT TYPE="RADIO" NAME="gwaction" VALUE="2">View Character loot history</LI></UL></FIELDSET>';
+	echo '<INPUT TYPE="SUBMIT" VALUE="Choose action"></FORM><BR /><BR /><FORM METHOD="POST" ACTION="gw-toon.php"><INPUT TYPE="HIDDEN" NAME="cnameid" VALUE="0"><INPUT TYPE="SUBMIT" VALUE="Return to character selection"></FORM></CENTER>';
 }
 ?>
\ No newline at end of file
