@@ -26,7 +26,7 @@ function ChannelFrame_OnLoad(self)
 	FauxScrollFrame_SetOffset(ChannelRosterScrollFrame, 0);
 	
 	for i = 2, 20 do
-		local button = CreateFrame("Button", "ChannelButton"..i, ChannelListScrollFrame, "ChannelButtonTemplate");
+		local button = CreateFrame("Button", "ChannelButton"..i, ChannelListScrollChildFrame, "ChannelButtonTemplate");
 		button:SetID(i);
 		button:SetPoint("TOPLEFT", _G["ChannelButton"..(i-1)], "BOTTOMLEFT");
 	end
@@ -98,7 +98,7 @@ function ChannelFrame_New_OnClick()
 		ChannelFrameDaughterFrameChannelPasswordLabel:SetText(PASSWORD);
 		ChannelFrameDaughterFrameChannelPasswordOptional:Show();
 		ChannelFrameDaughterFrameName:SetText(CHANNEL_NEW_CHANNEL);
-		--ChannelFrameDaughterFrameVoiceChat:SetChecked(1);
+		--ChannelFrameDaughterFrameVoiceChat:SetChecked(true);
 		--ChannelFrameDaughterFrameVoiceChat:Show();
 		ChannelFrameDaughterFrame:Show();
 		PlaySound("UChatScrollButton");
@@ -164,7 +164,7 @@ end
 --[ Channel List Functions ]--
 function ChannelList_Update()
 	-- Scroll Bar Handling --
-	local frameHeight = ChannelListScrollChildFrame:GetHeight();
+	local frameHeight = 0;
 	local button, buttonName, buttonLines, buttonCollapsed, buttonSpeaker, hideVoice;
 	local name, header, collapsed, channelNumber, active, count, category, voiceEnabled, voiceActive;
 	local channelCount = GetNumDisplayChannels();
@@ -254,13 +254,14 @@ function ChannelList_Update()
 				channelNumber = nil;
 			end
 			button:Show();
+
+			-- Scroll Bar Handling --
+			frameHeight = frameHeight + button:GetHeight();
 		else
 --			button.channel = nil;
 			button:Hide();
 			button.voiceEnabled = nil;
 			button.voiceActive = nil;
-			-- Scroll Bar Handling --
-			frameHeight = frameHeight - button:GetHeight();
 		end
 	end	
 
@@ -334,12 +335,12 @@ function ChannelList_UpdateVoice(id, ena
 		button.voiceEnabled = true;
 		if ( active ) then
 			button.voiceActive = true;
-			ChannelFrame_Desaturate(speakerIcon, nil, 0.75);
-			ChannelFrame_Desaturate(speakerFlash, nil, 0.75);
+			ChannelFrame_Desaturate(speakerIcon, false, 0.75);
+			ChannelFrame_Desaturate(speakerFlash, false, 0.75);
 		else
 			button.voiceActive = nil;
-			ChannelFrame_Desaturate(speakerIcon, 1, 0.5);
-			ChannelFrame_Desaturate(speakerFlash, 1, 0.5);
+			ChannelFrame_Desaturate(speakerIcon, true, 0.5);
+			ChannelFrame_Desaturate(speakerFlash, true, 0.5);
 		end
 		speaker:Show()
 		speaker:SetFrameLevel(speaker:GetFrameLevel()+5);
@@ -677,11 +678,11 @@ function ChannelRoster_UpdateVoice(id, e
 
 	if ( enabled ) then
 		if ( active ) then
-			ChannelFrame_Desaturate(speakerIcon, nil, 0.75);
-			ChannelFrame_Desaturate(speakerFlash, nil, 0.75);
+			ChannelFrame_Desaturate(speakerIcon, false, 0.75);
+			ChannelFrame_Desaturate(speakerFlash, false, 0.75);
 		else
-			ChannelFrame_Desaturate(speakerIcon, 1, 0.25);
-			ChannelFrame_Desaturate(speakerFlash, 1, 0.25);
+			ChannelFrame_Desaturate(speakerIcon, true, 0.25);
+			ChannelFrame_Desaturate(speakerFlash, true, 0.25);
 		end
 		if ( muted ) then
 			speakerMuted:Show();
@@ -1133,7 +1134,7 @@ function ChannelPulloutRoster_Update (ro
 	local name = 1;
 	
 	if ( not CHANNELPULLOUT_OPTIONS.session ) then
-		CHANNEL_EMPTY_DATA[name] = GRAY_FONT_COLOR_CODE .. NO_VOICE_SESSIONS;
+		CHANNEL_EMPTY_DATA[name] = GRAY_FONT_COLOR_CODE .. NO_VOICE_SESSIONS .. FONT_COLOR_CODE_CLOSE ;
 		ChannelPulloutRoster_DrawButton(rosterFrame.buttons[1], CHANNEL_EMPTY_DATA);
 		for i = 2, #rosterFrame.buttons do
 			ChannelPulloutRoster_DrawButton(rosterFrame.buttons[i], nil);
@@ -1180,12 +1181,12 @@ function ChannelPulloutRoster_DrawButton
 	end
 	
 	if ( data[sessionActive] ) then			
-		ChannelFrame_Desaturate(_G[button.speaker:GetName().."On"], nil, 0.75);
-		ChannelFrame_Desaturate(_G[button.speaker:GetName().."Flash"], nil, 0.75);
+		ChannelFrame_Desaturate(_G[button.speaker:GetName().."On"], false, 0.75);
+		ChannelFrame_Desaturate(_G[button.speaker:GetName().."Flash"], false, 0.75);
 		_G[button.speaker:GetName().."Muted"]:SetVertexColor(1, 1, 1, 1);
 	else
-		ChannelFrame_Desaturate(_G[button.speaker:GetName().."On"], 1, 0.25);
-		ChannelFrame_Desaturate(_G[button.speaker:GetName().."Flash"], 1, 0.25);
+		ChannelFrame_Desaturate(_G[button.speaker:GetName().."On"], true, 0.25);
+		ChannelFrame_Desaturate(_G[button.speaker:GetName().."Flash"], true, 0.25);
 		_G[button.speaker:GetName().."Muted"]:SetVertexColor(1, 1, 1, .35);
 	end