diff --git a/TurnIn.toc b/TurnIn.toc
index 9a88378..b3601a3 100644
--- a/TurnIn.toc
+++ b/TurnIn.toc
@@ -1,6 +1,6 @@
-## Interface: 20400
+## Interface: 20003
 ## Title: Turn In
 ## Description: Automates the selection of quest and gossip options.
 ## SavedVariables: TI_status, TI_NPCDB, TI_NPCIndex
-## Version: 2.0.8
+## Version: 2.0rc7
 TurnIn.xml
\ No newline at end of file
diff --git a/TurnIn.xml b/TurnIn.xml
index c5c6c92..aff8016 100644
--- a/TurnIn.xml
+++ b/TurnIn.xml
@@ -2,16 +2,51 @@
 	<Script file="TurnIn.lua" />
 	<Script file="TurnInUI.lua" />
 	
+	<Frame name="TI_OptionFrameBoxTemplate" virtual="true">
+		<!-- shamelessly stolen from blizzard -->
+		<Layers>
+			<Layer level="BACKGROUND">
+				<FontString name="$parentTitle" inherits="GameFontHighlight">
+					<Anchors>
+						<Anchor point="BOTTOMLEFT" relativePoint="TOPLEFT">
+							<Offset>
+								<AbsDimension x="9" y="0"/>
+							</Offset>
+						</Anchor>
+					</Anchors>
+				</FontString>
+			</Layer>
+		</Layers>
+		<Backdrop bgFile="Interface\Tooltips\UI-Tooltip-Background" edgeFile="Interface\Tooltips\UI-Tooltip-Border" tile="true">
+			<EdgeSize>
+				<AbsValue val="16"/>
+			</EdgeSize>
+			<TileSize>
+				<AbsValue val="16"/>
+			</TileSize>
+			<BackgroundInsets>
+				<AbsInset left="5" right="5" top="5" bottom="5"/>
+			</BackgroundInsets>
+		</Backdrop>
+		<Scripts>
+			<OnLoad>
+				self:SetBackdropBorderColor(0.4, 0.4, 0.4);
+				self:SetBackdropColor(0.5, 0.5, 0.5);
+			</OnLoad>
+		</Scripts>
+	</Frame>
+
+	
 	<Button name="TI_PriorityList" virtual="true" hidden="false">
 		<Size>
 			<AbsDimension x="235" y="20" />
 		</Size>
 		<Scripts><!--
 			<OnEnter>
-				getglobal(this:GetName() .. "_Background"):SetVertexColor(1,1,1,0.4);
+				getglobal(self:GetName() .. "_Background"):SetVertexColor(1,1,1,0.4);
 			</OnEnter>
 			<OnLeave>
-				getglobal(this:GetName() .. "_Background"):SetVertexColor(0,0,0,0.4);
+				getglobal(self:GetName() .. "_Background"):SetVertexColor(0,0,0,0.4);
 			</OnLeave>
 			-->
 		</Scripts>
@@ -262,7 +297,7 @@
 				</Size>
 				<Scripts>
 					<OnClick>
-						TI_DeleteTempNPCIndex(this:GetParent():GetID());
+						TI_DeleteTempNPCIndex(self:GetParent():GetID());
 					</OnClick>
 					<OnEnter>
 						TI_TooltipMessage("Delete");
@@ -285,7 +320,7 @@
 				</Size>
 				<Scripts>
 					<OnClick>
-						TI_AddTempNPCIndex(this:GetParent():GetID());
+						TI_AddTempNPCIndex(self:GetParent():GetID());
 					</OnClick>
 					<OnEnter>
 						TI_TooltipMessage("Add this NPC to the database");
@@ -381,21 +416,21 @@
 		</Backdrop>
 		<Scripts>
 			<OnMouseUp>
-				if ( this.isMoving ) then
-					this:StopMovingOrSizing();
-					this.isMoving = false;
+				if ( self.isMoving ) then
+					self:StopMovingOrSizing();
+					self.isMoving = false;
 				end
 			</OnMouseUp>
 			<OnMouseDown>
 				if (  arg1 == "LeftButton" ) then
-					this:StartMoving();
-					this.isMoving = true;
+					self:StartMoving();
+					self.isMoving = true;
 				end
 			</OnMouseDown>
 			<OnHide>
-				if ( this.isMoving ) then
-					this:StopMovingOrSizing();
-					this.isMoving = false;
+				if ( self.isMoving ) then
+					self:StopMovingOrSizing();
+					self.isMoving = false;
 				end
 			</OnHide>
 		</Scripts>
@@ -620,12 +655,12 @@
 				</Scripts>
 			</Frame>
 			
-			<Frame name="TI_OptionsPriorityContainer" inherits="OptionFrameBoxTemplate">
+			<Frame name="TI_OptionsPriorityContainer" inherits="TI_OptionFrameBoxTemplate">
 				<Scripts>
 					<OnLoad>
-						this:SetBackdropBorderColor(0.4, 0.4, 0.4);
-						this:SetBackdropColor(0.15, 0.15, 0.15);
-						getglobal(this:GetName().."Title"):SetText("Gossip Options Priority List");
+						self:SetBackdropBorderColor(0.4, 0.4, 0.4);
+						self:SetBackdropColor(0.15, 0.15, 0.15);
+						getglobal(self:GetName().."Title"):SetText("Gossip Options Priority List");
 					</OnLoad>
 				</Scripts>
 				<Anchors>
@@ -827,12 +862,12 @@
 				</Frames>
 			</Frame>
 			
-			<Frame name="TI_OptionsNPCContainer" inherits="OptionFrameBoxTemplate">
+			<Frame name="TI_OptionsNPCContainer" inherits="TI_OptionFrameBoxTemplate">
 				<Scripts>
 					<OnLoad>
-						this:SetBackdropBorderColor(0.4, 0.4, 0.4);
-						this:SetBackdropColor(0.15, 0.15, 0.15);
-						getglobal(this:GetName().."Title"):SetText("NPC Database");
+						self:SetBackdropBorderColor(0.4, 0.4, 0.4);
+						self:SetBackdropColor(0.15, 0.15, 0.15);
+						getglobal(self:GetName().."Title"):SetText("NPC Database");
 					</OnLoad>
 				</Scripts>
 				<Anchors>
@@ -862,7 +897,8 @@
 						</Anchors>
 						<Scripts>
 							<OnVerticalScroll>
-								FauxScrollFrame_OnVerticalScroll(20, TI_NPCListScrollBarUpdate);
+								--FauxScrollFrame_OnVerticalScroll(20, TI_NPCListScrollBarUpdate);
+								FauxScrollFrame_OnVerticalScroll(self, offset, 20, TI_NPCListScrollBarUpdate);
 							</OnVerticalScroll>
 							<OnShow>
 								TI_NPCListScrollBarUpdate();
diff --git a/TurnInUI.lua b/TurnInUI.lua
index b78f1d8..886cdc3 100644
--- a/TurnInUI.lua
+++ b/TurnInUI.lua
@@ -1,5 +1,4 @@
 function TI_PopulateOptions(arg)
-	--this is a comment
 	TI_debug(arg);
 	local CurrOpts;
 	local last=1;