diff --git a/KitchenSink/Resources/app.js b/KitchenSink/Resources/app.js
index 3c6a771..dd8ca1d 100644
--- a/KitchenSink/Resources/app.js
+++ b/KitchenSink/Resources/app.js
@@ -121,7 +121,7 @@ var messageWin = Titanium.UI.createWindow({
 	Titanium.UI.PORTRAIT,
 	Titanium.UI.UPSIDE_PORTRAIT,
 	Titanium.UI.LANDSCAPE_LEFT,
-	Titanium.UI.LANDSCAPE_RIGHT,
+	Titanium.UI.LANDSCAPE_RIGHT
 	]
 });
 var messageView = Titanium.UI.createView({
@@ -268,14 +268,13 @@ function showIndicator()
 	indWin.add(message);
 	indWin.open();
 	actInd.show();
-
-};
+}
 
 function hideIndicator()
 {
 	actInd.hide();
 	indWin.close({opacity:0,duration:500});
-};
+}
 
 //
 // Add global event handlers to hide/show custom indicator
diff --git a/KitchenSink/Resources/examples/animation_points.js b/KitchenSink/Resources/examples/animation_points.js
index 32c3911..067a521 100644
--- a/KitchenSink/Resources/examples/animation_points.js
+++ b/KitchenSink/Resources/examples/animation_points.js
@@ -26,6 +26,11 @@ var l = Ti.UI.createLabel({
 
 win.add(l);
 
+var interval = setInterval(function()
+{
+	l.text = 'center x: ' + circle.animatedCenter.x + ' y: ' + circle.animatedCenter.y;
+},1000);
+
 var b = Ti.UI.createButton({
 	title:'Stop Animation',
 	height:30,
@@ -40,8 +45,3 @@ circle.animate(a, function()
 {
 	clearInterval(interval);
 });
-
-var interval = setInterval(function()
-{
-	l.text = 'center x: ' + circle.animatedCenter.x + ' y: ' + circle.animatedCenter.y;
-},1000)
\ No newline at end of file
diff --git a/KitchenSink/Resources/examples/basic_animation.js b/KitchenSink/Resources/examples/basic_animation.js
index f5112d3..4ed6888 100644
--- a/KitchenSink/Resources/examples/basic_animation.js
+++ b/KitchenSink/Resources/examples/basic_animation.js
@@ -30,38 +30,6 @@ circle.addEventListener('touchmove', function(e)
 	circle.animate({center:{x:newX,y:newY}, duration:1}); 
 });
 
-var mode = 0;
-circle.addEventListener('click', function()
-{
-	switch(mode)
-	{
-		case 0:
-		{
-			firstAnimation();
-			mode++;
-			break;
-		}
-		case 1:
-		{
-			secondAnimation();
-			mode++
-			break;
-		}
-		case 2:
-		{
-			thirdAnimation();
-			mode++
-			break;
-		}
-		case 3:
-		{
-			fourthAnimation();
-			mode=0;
-			break;
-		}
-
-	}
-});
 
 //
 // ANIMATION FUNCTIONS
@@ -80,10 +48,9 @@ function firstAnimation()
 	circle.animate({opacity:0,transform:t,duration:500}, function()
 	{
 		var t = Ti.UI.create2DMatrix();
-
-		circle.animate({opacity:1,transform:t,duration:500})
+		circle.animate({opacity:1,transform:t,duration:500});
 	});
-};
+}
 
 // background color - use animation object
 function secondAnimation()
@@ -105,24 +72,23 @@ function secondAnimation()
 	{
 		Ti.API.info('IN START');
 		label.text = 'Animation started';
-
-	})
+	});
 
 	//
 	// ANIMATIONS SUPPORT A COMPLETE EVENT
 	//
 	a.addEventListener('complete', function()
 	{
-		Ti.API.info('IN COMPLETE')
+		Ti.API.info('IN COMPLETE');
 		label.text = 'Animation completed';
 		circle.animate(b);
 
 		setTimeout(function()
 		{
-			label.text = 'Click circle repeatedly to animate or drag window'
-		},2000)
+			label.text = 'Click circle repeatedly to animate or drag window';
+		}, 2000);
 	});
-};
+}
 
 // animate the top and right property
 function thirdAnimation()
@@ -131,7 +97,7 @@ function thirdAnimation()
 	{
 		circle.animate({top:0,left:0, duration:500});
 	});
-};
+}
 
 // animate the center point object
 function fourthAnimation()
@@ -144,6 +110,34 @@ function fourthAnimation()
 			{
 				circle.animate({center:{x:150,y:60, duration:1000}});
 			});
-		})
 	});
-};
+	});
+}
+
+var mode = 0;
+circle.addEventListener('click', function()
+{
+	switch(mode)
+	{
+		case 0:
+			firstAnimation();
+			mode++;
+			break;
+
+		case 1:
+			secondAnimation();
+			mode++;
+			break;
+
+		case 2:
+			thirdAnimation();
+			mode++;
+			break;
+
+		case 3:
+			fourthAnimation();
+			mode = 0;
+			break;
+	}
+});
+
diff --git a/KitchenSink/Resources/examples/bonjour.js b/KitchenSink/Resources/examples/bonjour.js
index 089e472..157af0b 100644
--- a/KitchenSink/Resources/examples/bonjour.js
+++ b/KitchenSink/Resources/examples/bonjour.js
@@ -6,8 +6,8 @@ var bonjourSocket = Titanium.Network.createTCPSocket({
 });
 
 bonjourSocket.addEventListener('read', function(e) {
-	var remoteSocket = e['from'];
-	var dataStr = e['data'].text;
+	var remoteSocket = e.from;
+	var dataStr = e.data.text;
 	if (dataStr == 'req') {
 		bonjourSocket.write('Hello, from '+Titanium.Platform.id, remoteSocket);
 	}
@@ -63,14 +63,21 @@ var tableView = Titanium.UI.createTableView({
 });
 
 tableView.addEventListener('click', function(r) {
-	var service = r['rowData'].service;
+	var service = r.rowData.service;
 	service.socket.write('req');
 });
 
+var bonjourListener = function (x) {
+  Titanium.UI.createAlertDialog({
+    title:'Bonjour message!',
+    message:x.data.text
+  }).show();
+};
+
 var services = null;
 updateUI = function(e) {
 	var data = [];
-	services = e['services'];
+	services = e.services;
 	
 	for (var i=0; i < services.length; i++) {
 		var service = services[i];
@@ -80,12 +87,7 @@ updateUI = function(e) {
 		});
 		
 		service.resolve();
-		service.socket.addEventListener('read', function(x) {
-			Titanium.UI.createAlertDialog({
-				title:'Bonjour message!',
-				message:x['data'].text
-			}).show();
-		});
+		service.socket.addEventListener('read', bonjourListener);
 		service.socket.connect();
 		
 		data.push(row);
@@ -98,7 +100,7 @@ updateUI = function(e) {
 	}
 	
 	tableView.setData(data);
-}
+};
 
 serviceBrowser.addEventListener('updatedServices', updateUI);
 
@@ -119,7 +121,7 @@ Titanium.UI.currentWindow.addEventListener('close', function(e) {
 		if (service.socket.isValid()) {
 			service.socket.close();
 		}
-		Titanium.API.info('Closed socket to service '+service.name+"...");
+		Titanium.API.info('Closed socket to service '+service.name+'...');
 	}
 });
 
diff --git a/KitchenSink/Resources/examples/button.js b/KitchenSink/Resources/examples/button.js
index f1193f6..4c46a32 100644
--- a/KitchenSink/Resources/examples/button.js
+++ b/KitchenSink/Resources/examples/button.js
@@ -47,7 +47,6 @@ b3.addEventListener('click', function()
 	switch (state)
 	{
 		case 0:
-		{
 			b3.enabled=false;
 			b3.title = 'I am Disabled';
 			state++;
@@ -59,9 +58,8 @@ b3.addEventListener('click', function()
 			},1000);
 			
 			break;
-		}
+
 		case 1:
-		{
 			b3.font = {fontSize:25,fontFamily:'Marker Felt', fontWeight:'bold'};
 			b3.title = 'I am red';
 			b3.backgroundImage = '../images/BUTT_red_off.png';
@@ -69,17 +67,14 @@ b3.addEventListener('click', function()
 			b3.color = '#222';
 			state++;
 			break;
-		}
+
 		case 2:
-		{
 			b3.width = 200;
 			b3.color = '#fff';
 			b3.title = 'White text';
 			state=0;
 			break;
 		}
-
-	}
 });
 
 var b4 = Titanium.UI.createButton({
diff --git a/KitchenSink/Resources/examples/camera_basic.js b/KitchenSink/Resources/examples/camera_basic.js
index 31a9b6e..6680137 100644
--- a/KitchenSink/Resources/examples/camera_basic.js
+++ b/KitchenSink/Resources/examples/camera_basic.js
@@ -40,5 +40,5 @@ Titanium.Media.showCamera({
 	},
 	saveToPhotoGallery:true,
 	allowEditing:true,
-	mediaTypes:[Ti.Media.MEDIA_TYPE_VIDEO,Ti.Media.MEDIA_TYPE_PHOTO],
+	mediaTypes:[Ti.Media.MEDIA_TYPE_VIDEO,Ti.Media.MEDIA_TYPE_PHOTO]
 });
diff --git a/KitchenSink/Resources/examples/camera_video.js b/KitchenSink/Resources/examples/camera_video.js
index 813399f..f6889a5 100644
--- a/KitchenSink/Resources/examples/camera_video.js
+++ b/KitchenSink/Resources/examples/camera_video.js
@@ -23,7 +23,7 @@ var cameraFlash = Ti.UI.createButton({
 	height:40,
 	width:80,
 	backgroundImage:"../images/BUTT_drk_on.png",
-	font:{fontSize:16,fontWeight:'bold',fontFamily:'Helvetica Neue'},
+	font:{fontSize:16,fontWeight:'bold',fontFamily:'Helvetica Neue'}
 });
 overlay.add(cameraFlash);
 
@@ -56,18 +56,10 @@ var cameraType = Ti.UI.createButton({
 	height:40,
 	width:80,
 	backgroundImage:"../images/BUTT_drk_on.png",
-	font:{fontSize:16,fontWeight:'bold',fontFamily:'Helvetica Neue'},
+	font:{fontSize:16,fontWeight:'bold',fontFamily:'Helvetica Neue'}
 });
 
-var cameras = Ti.Media.availableCameras;
-for (var c=0;c<cameras.length;c++)
-{
-	// if we have a rear camera ... we add switch button
-	if (cameras[c]==Ti.Media.CAMERA_REAR)
-	{
-		overlay.add(cameraType);
-
-		cameraType.addEventListener('click',function()
+var cameraListener = function()
 		{
 			if (Ti.Media.camera == Ti.Media.CAMERA_FRONT)
 			{
@@ -79,7 +71,17 @@ for (var c=0;c<cameras.length;c++)
 				cameraType.title = "rear";
 				Ti.Media.switchCamera(Ti.Media.CAMERA_FRONT);
 			}
-		});
+};
+
+var cameras = Ti.Media.availableCameras;
+for (var c=0;c<cameras.length;c++)
+{
+	// if we have a rear camera ... we add switch button
+	if (cameras[c]==Ti.Media.CAMERA_REAR)
+	{
+		overlay.add(cameraType);
+
+		cameraType.addEventListener('click', cameraListener);
 		break;
 	}
 }
diff --git a/KitchenSink/Resources/examples/contacts_add.js b/KitchenSink/Resources/examples/contacts_add.js
index 1e8ae54..017fd87 100644
--- a/KitchenSink/Resources/examples/contacts_add.js
+++ b/KitchenSink/Resources/examples/contacts_add.js
@@ -10,14 +10,14 @@ var v1 = Ti.UI.createView({
 var l1 = Ti.UI.createLabel({
 	text:'First:',
 	top:0,
-	left:0,
+	left:0
 });
 var f1 = Ti.UI.createTextField({
 	text:'',
 	borderStyle:Titanium.UI.INPUT_BORDERSTYLE_ROUNDED,
 	top:0,
 	right:0,
-	width:200,
+	width:200
 });
 v1.add(l1);
 v1.add(f1);
@@ -31,14 +31,14 @@ var v2 = Ti.UI.createView({
 var l2 = Ti.UI.createLabel({
 	text:'Last:',
 	top:0,
-	left:0,
+	left:0
 });
 var f2 = Ti.UI.createTextField({
 	text:'',
 	borderStyle:Titanium.UI.INPUT_BORDERSTYLE_ROUNDED,
 	top:0,
 	right:0,
-	width:200,
+	width:200
 });
 v2.add(l2);
 v2.add(f2);
@@ -52,14 +52,14 @@ var v3 = Ti.UI.createView({
 var l3 = Ti.UI.createLabel({
 	text:'Street:',
 	top:0,
-	left:0,
+	left:0
 });
 var f3 = Ti.UI.createTextField({
 	text:'',
 	borderStyle:Titanium.UI.INPUT_BORDERSTYLE_ROUNDED,
 	top:0,
 	right:0,
-	width:200,
+	width:200
 });
 v3.add(l3);
 v3.add(f3);
@@ -73,14 +73,14 @@ var v4 = Ti.UI.createView({
 var l4 = Ti.UI.createLabel({
 	text:'City:',
 	top:0,
-	left:0,
+	left:0
 });
 var f4 = Ti.UI.createTextField({
 	text:'',
 	borderStyle:Titanium.UI.INPUT_BORDERSTYLE_ROUNDED,
 	top:0,
 	right:0,
-	width:200,
+	width:200
 });
 v4.add(l4);
 v4.add(f4);
@@ -94,14 +94,14 @@ var v5 = Ti.UI.createView({
 var l5 = Ti.UI.createLabel({
 	text:'State:',
 	top:0,
-	left:0,
+	left:0
 });
 var f5 = Ti.UI.createTextField({
 	text:'',
 	borderStyle:Titanium.UI.INPUT_BORDERSTYLE_ROUNDED,
 	top:0,
 	right:0,
-	width:200,
+	width:200
 });
 v5.add(l5);
 v5.add(f5);
@@ -115,14 +115,14 @@ var v6 = Ti.UI.createView({
 var l6 = Ti.UI.createLabel({
 	text:'ZIP:',
 	top:0,
-	left:0,
+	left:0
 });
 var f6 = Ti.UI.createTextField({
 	text:'',
 	borderStyle:Titanium.UI.INPUT_BORDERSTYLE_ROUNDED,
 	top:0,
 	right:0,
-	width:200,
+	width:200
 });
 v6.add(l6);
 v6.add(f6);
diff --git a/KitchenSink/Resources/examples/contacts_db.js b/KitchenSink/Resources/examples/contacts_db.js
index aa04ce9..242e8eb 100644
--- a/KitchenSink/Resources/examples/contacts_db.js
+++ b/KitchenSink/Resources/examples/contacts_db.js
@@ -1,15 +1,6 @@
 var win = Ti.UI.currentWindow;
 
-var makeTable = function() {
-	var people = Titanium.Contacts.getAllPeople();
-	var rows = [];
-	for (var i = 0; i < people.length; i++) {
-		rows[i] = Ti.UI.createTableViewRow({
-			title:people[i].fullName,
-			person:people[i],
-			hasChild:true
-		});
-		rows[i].addEventListener('click', function(e) {
+var clickListener = function(e) {
 			var display = Ti.UI.createWindow({
 				backroundColor:'white',
 				title:e.row.person.fullName
@@ -25,17 +16,27 @@ var makeTable = function() {
 						top:top,
 						left:20,
 						height:'auto',
-						width:'auto',
+						width:'auto'
 					});
 					display.add(info);
 				}
 			}
-			
 			Titanium.UI.currentTab.open(display,{animated:true});
+};
+
+var makeTable = function() {
+	var people = Titanium.Contacts.getAllPeople();
+	var rows = [];
+	for (var i = 0; i < people.length; i++) {
+		rows[i] = Ti.UI.createTableViewRow({
+			title:people[i].fullName,
+			person:people[i],
+			hasChild:true
 		});
+		rows[i].addEventListener('click', clickListener);
 	}
 	return rows;
-}
+};
 
 var tableview = Ti.UI.createTableView({
 	data:makeTable()
diff --git a/KitchenSink/Resources/examples/contacts_groups.js b/KitchenSink/Resources/examples/contacts_groups.js
index d6a0b25..7c88f64 100644
--- a/KitchenSink/Resources/examples/contacts_groups.js
+++ b/KitchenSink/Resources/examples/contacts_groups.js
@@ -36,14 +36,14 @@ var updatePeople = function() {
 		people = [];
 	}
 	infoLabel.text = text;
-}
+};
 
 for (var i=0; i < groups.length; i++) {
 	data[i] = Ti.UI.createPickerRow({title:groups[i].name});
 }
 
 var groupPicker = Ti.UI.createPicker({
-	top:50,
+	top:50
 });
 groupPicker.addEventListener('change', function(e) {
 	selectedGroup = groups[e.rowIndex];
diff --git a/KitchenSink/Resources/examples/contacts_picker.js b/KitchenSink/Resources/examples/contacts_picker.js
index 7019dbf..577f6ea 100644
--- a/KitchenSink/Resources/examples/contacts_picker.js
+++ b/KitchenSink/Resources/examples/contacts_picker.js
@@ -1,5 +1,12 @@
 var win = Ti.UI.currentWindow;
 
+var info = Ti.UI.createLabel({
+	text:'',
+	bottom:70,
+	height:'auto',
+	width:'auto'
+});
+
 var values = {cancel:function() {info.text = 'Cancelled';}};
 var show = Ti.UI.createButton({
 	title:'Show picker',
@@ -11,13 +18,6 @@ show.addEventListener('click', function() {
 	Titanium.Contacts.showContacts(values);
 });
 
-var info = Ti.UI.createLabel({
-	text:'',
-	bottom:70,
-	height:'auto',
-	width:'auto'
-});
-
 var v1 = Ti.UI.createView({
 	top:20,
 	width:300,
@@ -26,7 +26,7 @@ var v1 = Ti.UI.createView({
 });
 var l1 = Ti.UI.createLabel({
 	text:'Animated:',
-	left:0,
+	left:0
 });
 var s1 = Ti.UI.createSwitch({
 	value:true,
@@ -34,12 +34,7 @@ var s1 = Ti.UI.createSwitch({
 	top:5
 });
 s1.addEventListener('change', function() {
-	if (s1.value) {
-		values.animated = true;
-	}
-	else {
-		values.animated = false;
-	}
+	values.animated = s1.value;
 });
 v1.add(l1);
 v1.add(s1);
@@ -52,7 +47,7 @@ var v2 = Ti.UI.createView({
 });
 var l2 = Ti.UI.createLabel({
 	text:'Address only:',
-	left:0,
+	left:0
 });
 var s2 = Ti.UI.createSwitch({
 	value:false,
@@ -85,11 +80,17 @@ var s3 = Ti.UI.createSwitch({
 	right:10,
 	top:5
 });
+var s4 = Ti.UI.createSwitch({
+	value:false,
+	right:10,
+	top:5
+});
+
 s3.addEventListener('change', function() {
 	if (s3.value) {
 		values.selectedPerson = function(e) {
 			info.text = e.person.fullName;
-		}
+		};
 		if (s4.value) {
 			s4.value = false;
 		}
@@ -111,22 +112,17 @@ var l4 = Ti.UI.createLabel({
 	text:'Stop on property:',
 	left:0
 });
-var s4 = Ti.UI.createSwitch({
-	value:false,
-	right:10,
-	top:5
-});
 s4.addEventListener('change', function() {
 	if (s4.value) {
 		values.selectedProperty = function(e) {
 			if (e.property == 'address') {
 				Ti.API.log(e.value);
-				info.text = e.value.Street
+				info.text = e.value.Street;
 			}
 			else {
 				info.text = e.value;
 			}
-		}
+		};
 		if (s3.value) {
 			s3.value = false;
 		}
diff --git a/KitchenSink/Resources/examples/dashboard.js b/KitchenSink/Resources/examples/dashboard.js
index 0df062a..4c9f598 100644
--- a/KitchenSink/Resources/examples/dashboard.js
+++ b/KitchenSink/Resources/examples/dashboard.js
@@ -12,7 +12,10 @@ for (var x=0;x<2;x++)
 			selectedImage:'../images/dashboard/'+labels[c]+'_on.png',
 			label:labels[c]
 		});
-		if (c==0) item.badge = 10;
+		if (c==0)
+		{
+			item.badge = 10;
+		}
 		data.push(item);
 	}
 }
@@ -51,7 +54,7 @@ dashboard.addEventListener('commit',function()
 	Ti.API.info('data ' + dashboard.data);
 	for (var i=0;i<dashboard.data.length;i++)
 	{
-		Ti.API.info('label ' + dashboard.data[i].label)
+		Ti.API.info('label ' + dashboard.data[i].label);
 	}
 });
 
diff --git a/KitchenSink/Resources/examples/facebook_properties.js b/KitchenSink/Resources/examples/facebook_properties.js
index 54ec73f..1c79c02 100644
--- a/KitchenSink/Resources/examples/facebook_properties.js
+++ b/KitchenSink/Resources/examples/facebook_properties.js
@@ -54,7 +54,7 @@ b1.addEventListener('click', function()
 {
 	Ti.API.info("click called, logged in = "+Titanium.Facebook.isLoggedIn());
 	
-	if (Titanium.Facebook.isLoggedIn()==false)
+	if (!Titanium.Facebook.isLoggedIn())
 	{
 		Ti.UI.createAlertDialog({title:'Facebook', message:'Login before accessing properties'}).show();
 		return;
@@ -64,7 +64,7 @@ b1.addEventListener('click', function()
 	Ti.API.info('permissions = ' + Ti.Facebook.permissions);
 	if (Ti.Facebook.permissions!=null)
 	{
-		for (v in Ti.Facebook.permissions)
+		for (var v in Ti.Facebook.permissions)
 		{
 			if (v!=null)
 			{
diff --git a/KitchenSink/Resources/examples/facebook_query.js b/KitchenSink/Resources/examples/facebook_query.js
index a3d3420..00f47d0 100644
--- a/KitchenSink/Resources/examples/facebook_query.js
+++ b/KitchenSink/Resources/examples/facebook_query.js
@@ -40,7 +40,7 @@ function runQuery()
 	var query = "SELECT uid, name, pic_square, status FROM user ";
 	query +=  "where uid IN (SELECT uid2 FROM friend WHERE uid1 = " + Titanium.Facebook.getUserId() + ")"; 
 	query += "order by last_name";
-	Ti.API.info('user id ' + Titanium.Facebook.getUserId())
+	Ti.API.info('user id ' + Titanium.Facebook.getUserId());
 	Titanium.Facebook.query(query, function(r)
 	{
 		var data = [];
@@ -106,11 +106,11 @@ function runQuery()
 		win.open({modal:true});
 		b1.title = 'Run Query';
 	});	
-};
+}
 
 b1.addEventListener('click', function()
 {
-	if (Titanium.Facebook.isLoggedIn()==false)
+	if (!Titanium.Facebook.isLoggedIn())
 	{
 		Ti.UI.createAlertDialog({title:'Facebook', message:'Login before running query'}).show();
 		return;
diff --git a/KitchenSink/Resources/examples/filesystem.js b/KitchenSink/Resources/examples/filesystem.js
index 5dbbfc2..2b5a8d5 100644
--- a/KitchenSink/Resources/examples/filesystem.js
+++ b/KitchenSink/Resources/examples/filesystem.js
@@ -37,7 +37,7 @@ Ti.API.info('spaceAvailable = ' + dir.spaceAvailable());
 
 var newDir = Titanium.Filesystem.getFile(Titanium.Filesystem.applicationDataDirectory,'mydir');
 newDir.createDirectory();
-Ti.API.info('newdir ' + newDir)
+Ti.API.info('newdir ' + newDir);
 var newFile = Titanium.Filesystem.getFile(newDir.nativePath,'newfile.txt');
 newFile.write(f.read());
 Ti.API.info('directoryListing for newDir = ' + newDir.getDirectoryListing());
@@ -49,8 +49,8 @@ newDir.deleteDirectory();
 Ti.API.info('directoryListing for newDir after deleteDirectory = ' + newDir.getDirectoryListing());
 
 if (Ti.Platform.name == 'android') {
-	var dir = Titanium.Filesystem.getFile(Titanium.Filesystem.externalStorageDirectory);
-	Ti.API.info('external directoryListing = ' + dir.getParent().getDirectoryListing());
+	var aDir = Titanium.Filesystem.getFile(Titanium.Filesystem.externalStorageDirectory);
+	Ti.API.info('external directoryListing = ' + aDir.getParent().getDirectoryListing());
 }
 	
 var l = Titanium.UI.createLabel({text:'Check Log for details', width:300, height:'auto', textAlign:'center'});
@@ -58,6 +58,6 @@ win.add(l);
 
 // test to make sure we can still access compiled JS files
 var jsfile = Titanium.Filesystem.getFile(Titanium.Filesystem.resourcesDirectory,'app.js');
-Ti.API.info("app.js exists? " + f.exists())
-Ti.API.info("app.js size? " + f.size)
+Ti.API.info("app.js exists? " + f.exists());
+Ti.API.info("app.js size? " + f.size);
 
diff --git a/KitchenSink/Resources/examples/geolocation.js b/KitchenSink/Resources/examples/geolocation.js
index ad3bf55..fecec42 100644
--- a/KitchenSink/Resources/examples/geolocation.js
+++ b/KitchenSink/Resources/examples/geolocation.js
@@ -192,7 +192,7 @@ win.add(reverseGeo);
 //
 //  SHOW CUSTOM ALERT IF DEVICE HAS GEO TURNED OFF
 //
-if (Titanium.Geolocation.locationServicesEnabled==false)
+if (!Titanium.Geolocation.locationServicesEnabled)
 {
 	Titanium.UI.createAlertDialog({title:'Kitchen Sink', message:'Your device has geo turned off - turn it on.'}).show();
 }
@@ -301,7 +301,7 @@ else
 		if (e.error)
 		{
 			currentLocation.text = 'error: ' + JSON.stringify(e.error);
-			alert('error ' + JSON.stringify(e.error))
+			alert('error ' + JSON.stringify(e.error));
 			return;
 		}
 
@@ -313,7 +313,7 @@ else
 		var speed = e.coords.speed;
 		var timestamp = e.coords.timestamp;
 		var altitudeAccuracy = e.coords.altitudeAccuracy;
-		Ti.API.info('speed ' + speed)
+		Ti.API.info('speed ' + speed);
 		currentLocation.text = 'long:' + longitude + ' lat: ' + latitude;
 		
 		Titanium.API.info('geo - current location: ' + new Date(timestamp) + ' long ' + longitude + ' lat ' + latitude + ' accuracy ' + accuracy);
@@ -380,7 +380,7 @@ var addr = "2065 Hamilton Avenue San Jose California 95125";
 
 Titanium.Geolocation.forwardGeocoder(addr,function(evt)
 {
-	Ti.API.info('in forward ')
+	Ti.API.info('in forward ');
 	forwardGeo.text = "lat:"+evt.latitude+", long:"+evt.longitude;
 	Titanium.Geolocation.reverseGeocoder(evt.latitude,evt.longitude,function(evt)
 	{
diff --git a/KitchenSink/Resources/examples/horizontal_layout.js b/KitchenSink/Resources/examples/horizontal_layout.js
index 96356e1..6ec35c5 100644
--- a/KitchenSink/Resources/examples/horizontal_layout.js
+++ b/KitchenSink/Resources/examples/horizontal_layout.js
@@ -11,7 +11,7 @@ var l1 = Ti.UI.createLabel({
 	text:'I am the first label',
 	left:5,
 	width:'auto',
-	height:20,
+	height:20
 });
 
 view.add(l1);
diff --git a/KitchenSink/Resources/examples/json.js b/KitchenSink/Resources/examples/json.js
index 1032306..fefb2a8 100755
--- a/KitchenSink/Resources/examples/json.js
+++ b/KitchenSink/Resources/examples/json.js
@@ -8,8 +8,8 @@ function testRow(name, str, testfn) {
 
 testRow("nested object", "{\"a\": {\"b\": 1}}", function(obj) { return obj.a.b == 1; });
 testRow("array", "[1, 2, 3]", function(obj) { return obj[0] == 1 && obj[1] == 2 && obj[2] == 3; });
-testRow("integer", "123", function(obj) { return obj==123 });
-testRow("double", "123.456", function(obj) { return obj == 123.456 });
+testRow("integer", "123", function(obj) { return obj==123; });
+testRow("double", "123.456", function(obj) { return obj == 123.456; });
 
 var testTable = Titanium.UI.createTableView({
 	top:0, left:0, bottom:0, right:0,
diff --git a/KitchenSink/Resources/examples/label.js b/KitchenSink/Resources/examples/label.js
index cbc2c88..bc7299d 100644
--- a/KitchenSink/Resources/examples/label.js
+++ b/KitchenSink/Resources/examples/label.js
@@ -55,6 +55,14 @@ var b2 = Titanium.UI.createButton({
 	width:200,
 	top:280
 });
+var size = Ti.UI.createLabel({
+	height:30,
+	width:300,
+	font:{fontSize:14},
+	color:'#777',
+	bottom:10
+});
+
 var changed=false;
 b2.addEventListener('click', function()
 {
@@ -64,14 +72,14 @@ b2.addEventListener('click', function()
 		l2.shadowColor = '#336699';
 		l2.font = {fontSize:20};
 		changed=true;
-		size.text = l2.size.height + ' ' + l2.size.width
+		size.text = l2.size.height + ' ' + l2.size.width;
 	}
 	else
 	{
 		l2.color = '#900';
 		l2.shadowColor = '#aaa';
 		l2.font = {fontSize:48};
-		size.text = l2.size.height + ' ' + l2.size.width
+		size.text = l2.size.height + ' ' + l2.size.width;
 		changed=false;
 	}
 });
@@ -100,12 +108,4 @@ b3.addEventListener('click', function()
 	}
 });
 win.add(b3);
-
-var size = Ti.UI.createLabel({
-	height:30,
-	width:300,
-	font:{fontSize:14},
-	color:'#777',
-	bottom:10
-});
-win.add(size)
\ No newline at end of file
+win.add(size);
\ No newline at end of file
diff --git a/KitchenSink/Resources/examples/map_view.js b/KitchenSink/Resources/examples/map_view.js
index ec8dcd1..e949450 100644
--- a/KitchenSink/Resources/examples/map_view.js
+++ b/KitchenSink/Resources/examples/map_view.js
@@ -144,7 +144,7 @@ sv.addEventListener('click', function()
 mapview.addEventListener('complete', function()
 {
 	Ti.API.info("map has completed loaded region");
-})
+});
 
 
 var flexSpace = Titanium.UI.createButton({
@@ -267,7 +267,7 @@ mapview.addEventListener('click',function(evt)
 	// custom annotation attribute
 	var myid = (evt.annotation)?evt.annotation.myid:-1;
 
-	Ti.API.info('mapview click clicksource = ' + clickSource)
+	Ti.API.info('mapview click clicksource = ' + clickSource);
 	// use custom event attribute to determine if atlanta annotation was clicked
 	if (myid == 3 && evt.clicksource == 'rightButton')
 	{
@@ -282,7 +282,7 @@ mapview.addEventListener('click',function(evt)
 	}
 	if (myid == 2)
 	{
-		if(annotationAdded==false)
+		if(!annotationAdded)
 		{
 			mapview.addAnnotation(mountainView);
 			annotationAdded=true;
@@ -301,16 +301,13 @@ atlanta.addEventListener('click', function(evt)
 	// get event properties
 	var annotation = evt.source;
 	var clicksource = evt.clicksource;
-	Ti.API.info('atlanta annotation click clicksource = ' + clicksource)
+	Ti.API.info('atlanta annotation click clicksource = ' + clicksource);
 });
 
 apple.addEventListener('click', function(evt)
 {
-
 	// get event properties
 	var annotation = evt.source;
 	var clicksource = evt.clicksource;
-	Ti.API.info('apple annotation click clicksource = ' + clicksource)
-
-
+	Ti.API.info('apple annotation click clicksource = ' + clicksource);
 });
diff --git a/KitchenSink/Resources/examples/map_view2.js b/KitchenSink/Resources/examples/map_view2.js
index 6a5587a..a0da77e 100644
--- a/KitchenSink/Resources/examples/map_view2.js
+++ b/KitchenSink/Resources/examples/map_view2.js
@@ -65,5 +65,5 @@ annotation.addEventListener('click',function()
 mapview.addEventListener('click',function(evt)
 {
 	var clickSource = evt.clicksource;
-	Ti.API.info('mapview click clicksource = ' + clickSource)
+	Ti.API.info('mapview click clicksource = ' + clickSource);
 });
\ No newline at end of file
diff --git a/KitchenSink/Resources/examples/music.js b/KitchenSink/Resources/examples/music.js
index a3f9b92..f6db9f7 100644
--- a/KitchenSink/Resources/examples/music.js
+++ b/KitchenSink/Resources/examples/music.js
@@ -23,7 +23,7 @@ var timeBar = Ti.UI.createProgressBar({
 	height:40,
 	top:240,
 	color:'#888',
-	style:Titanium.UI.iPhone.ProgressBarStyle.PLAIN,
+	style:Titanium.UI.iPhone.ProgressBarStyle.PLAIN
 });
 win.add(timeBar);
 
@@ -109,7 +109,7 @@ var b2 = Ti.UI.createButton({
 	title:'Pause',
 	width:80,
 	height:40,
-	top:20,
+	top:20
 });
 b2.addEventListener('click', function() {
 	player.pause();
@@ -179,7 +179,7 @@ var b8 = Ti.UI.createButton({
 	title:'Skip |>',
 	width:80,
 	height:40,
-	top:140,
+	top:140
 });
 b8.addEventListener('click', function() {
 	player.skipToBeginning();
@@ -201,7 +201,7 @@ win.add(b9);
 // MODAL SETTINGS BIT...
 var settingsWindow = Ti.UI.createWindow({
 	backgroundColor:'#fff',
-	title:'Picker settings',
+	title:'Picker settings'
 });
 
 var settings = {
@@ -307,6 +307,26 @@ v3.add(s3);
 settingsWindow.add(v3);
 
 var switches = [];
+
+var mediaTypeListener = function(e) {
+  var type = e.source.type;
+  var index = e.source.index;
+
+  Ti.API.log('Setting media type: '+type+' to '+e.source.value);
+
+  if (e.source.value) {
+    settings.mediaTypes |= type;
+  }
+  else {
+    settings.mediaTypes ^= type;
+    for (var i=0; i < 5; i++) {
+      if (index != i && switches[i].value) {
+        settings.mediaTypes |= switches[i].type;
+      }
+    }
+  }
+};
+
 for (var i=0; i < 5; i++) {
 	var baseTop = 115;
 	var v = Ti.UI.createView({
@@ -357,24 +377,7 @@ for (var i=0; i < 5; i++) {
 		s.value = true;
 	}
 	
-	s.addEventListener('change', function(e) {
-		var type = e.source.type;
-		var index = e.source.index;
-		
-		Ti.API.log('Setting media type: '+type+' to '+e.source.value);
-		
-		if (e.source.value) {
-			settings.mediaTypes |= type;
-		}
-		else {
-			settings.mediaTypes ^= type;
-			for (var i=0; i < 5; i++) {
-				if (index != i && switches[i].value) {
-					settings.mediaTypes |= switches[i].type;
-				}
-			}
-		}
-	});
+	s.addEventListener('change', mediaTypeListener);
 	switches.push(s);
 	
 	v.add(l);
@@ -397,7 +400,7 @@ var b10 = Ti.UI.createButton({
 	width:120,
 	height:40,
 	bottom:20,
-	left:20,
+	left:20
 });
 b10.addEventListener('click', function() {
 	settingsWindow.open({modal:true});
diff --git a/KitchenSink/Resources/examples/navgroup.js b/KitchenSink/Resources/examples/navgroup.js
index f33638f..dc7e349 100644
--- a/KitchenSink/Resources/examples/navgroup.js
+++ b/KitchenSink/Resources/examples/navgroup.js
@@ -2,23 +2,25 @@
 // since we're embedding a navgroup inside the modal
 // window which also has a nav bar, we ask him to hide it
 
-var open = Ti.UI.createButton({
+var openGroup = Ti.UI.createButton({
 	title:'Open nav group',
 	top:150,
 	width:200,
 	height:40
 });
-open.addEventListener('click', function() {
-	modal.open({modal:true});
-});
-Ti.UI.currentWindow.add(open);
 
 var modal = Ti.UI.createWindow({
 	navBarHidden:true
 });
 
+openGroup.addEventListener('click', function() {
+	modal.open({modal:true});
+});
+Ti.UI.currentWindow.add(openGroup);
+
+
 var modalWin = Ti.UI.createWindow({
-	backgroundColor:"red",
+	backgroundColor:"red"
 });
 
 var nav = Ti.UI.iPhone.createNavigationGroup({
@@ -59,17 +61,17 @@ table.addEventListener('click',function(e)
 	{
 		Ti.API.info("nav group window -- blur event");
 	});
-	var b = Ti.UI.createButton({
+	var close = Ti.UI.createButton({
 		title:"Close Nav",
 		width:120,
 		height:40
 	});
-	b.addEventListener('click',function()
+	close.addEventListener('click',function()
 	{
 		nav.close();
 		modal.close();
 	});
-	w.add(b);
+	w.add(close);
 	nav.open(w);
 });
 
diff --git a/KitchenSink/Resources/examples/options_dialog.js b/KitchenSink/Resources/examples/options_dialog.js
index ab8d876..f88054c 100644
--- a/KitchenSink/Resources/examples/options_dialog.js
+++ b/KitchenSink/Resources/examples/options_dialog.js
@@ -10,6 +10,19 @@ var dialog = Titanium.UI.createOptionDialog({
 	title:'I am a title'
 });
 
+// label that shows clicked option
+var label = Titanium.UI.createLabel({
+	text:'No selection' ,
+	color:'#999',
+	font:{
+		fontFamily:'Helvetica Neue',
+		fontSize:15
+	},
+	textAlign:'center',
+	top:110,
+	width:300
+});
+
 // add event listener
 dialog.addEventListener('click',function(e)
 {
@@ -44,19 +57,6 @@ button2.addEventListener('click', function()
 	dialog.show();
 });
 
-// label that shows clicked option
-var label = Titanium.UI.createLabel({
-	text:'No selection' ,
-	color:'#999',
-	font:{
-		fontFamily:'Helvetica Neue',
-		fontSize:15
-	},
-	textAlign:'center',
-	top:110,
-	width:300
-});
-
 win.add(button1);
 win.add(button2);
 win.add(label);
diff --git a/KitchenSink/Resources/examples/orientation.js b/KitchenSink/Resources/examples/orientation.js
index e50000c..2a92850 100644
--- a/KitchenSink/Resources/examples/orientation.js
+++ b/KitchenSink/Resources/examples/orientation.js
@@ -31,33 +31,19 @@ function getOrientation(o)
 	switch (o)
 	{
 		case Titanium.UI.PORTRAIT:
-		{
 			return 'portrait';
-		}
 		case Titanium.UI.UPSIDE_PORTRAIT:
-		{
 			return 'upside portrait';
-		}
 		case Titanium.UI.LANDSCAPE_LEFT:
-		{
 			return 'landscape left';
-		}
 		case Titanium.UI.LANDSCAPE_RIGHT:
-		{
 			return 'landscape right';
-		}
 		case Titanium.UI.FACE_UP:
-		{
 			return 'face up';
-		}
 		case Titanium.UI.FACE_DOWN:
-		{
 			return 'face down';
-		}
 		case Titanium.UI.UNKNOWN:
-		{
 			return 'unknown';
-		}
 	}
 }
 
diff --git a/KitchenSink/Resources/examples/photo_gallery.js b/KitchenSink/Resources/examples/photo_gallery.js
index 679d4fe..db4c7d9 100644
--- a/KitchenSink/Resources/examples/photo_gallery.js
+++ b/KitchenSink/Resources/examples/photo_gallery.js
@@ -52,5 +52,5 @@ Titanium.Media.openPhotoGallery({
 	allowEditing:true,
 	popoverView:popoverView,
 	arrowDirection:arrowDirection,
-	mediaTypes:[Ti.Media.MEDIA_TYPE_VIDEO,Ti.Media.MEDIA_TYPE_PHOTO],
+	mediaTypes:[Ti.Media.MEDIA_TYPE_VIDEO,Ti.Media.MEDIA_TYPE_PHOTO]
 });
diff --git a/KitchenSink/Resources/examples/picker.js b/KitchenSink/Resources/examples/picker.js
index 49bdb78..1790fda 100644
--- a/KitchenSink/Resources/examples/picker.js
+++ b/KitchenSink/Resources/examples/picker.js
@@ -16,7 +16,7 @@ var data = [
 	{title:'Date Picker', hasChild:true, test:'../examples/picker_date1.js'},
 	{title:'Time Picker', hasChild:true, test:'../examples/picker_date2.js'},
 	{title:'Date/Time Picker', hasChild:true, test:'../examples/picker_date3.js'},
-	{title:'Countdown Picker', hasChild:true, test:'../examples/picker_date4.js'},
+	{title:'Countdown Picker', hasChild:true, test:'../examples/picker_date4.js'}
 ];
 
 // create table view
diff --git a/KitchenSink/Resources/examples/picker_date1.js b/KitchenSink/Resources/examples/picker_date1.js
index 7295c62..55428fe 100644
--- a/KitchenSink/Resources/examples/picker_date1.js
+++ b/KitchenSink/Resources/examples/picker_date1.js
@@ -1,15 +1,15 @@
 var win = Titanium.UI.currentWindow;
 win.backgroundColor = 'black';
 
-var minDate = new Date()
+var minDate = new Date();
 minDate.setFullYear(2009);
 minDate.setMonth(0);
-minDate.setDate(1)
+minDate.setDate(1);
 
-var maxDate = new Date()
+var maxDate = new Date();
 maxDate.setFullYear(2009);
 maxDate.setMonth(11);
-maxDate.setDate(31)
+maxDate.setDate(31);
 
 var value = new Date();
 value.setFullYear(2009);
@@ -20,7 +20,7 @@ var picker = Ti.UI.createPicker({
 	type:Ti.UI.PICKER_TYPE_DATE,
 	minDate:minDate,
 	maxDate:maxDate,
-	value:value,
+	value:value
 });
 
 // turn on the selection indicator (off by default)
@@ -43,7 +43,7 @@ picker.addEventListener('change',function(e)
 	label.text = e.value;
 });
 
-var locale = false
+var locale = false;
 var localebutton = Ti.UI.createButton({
 	title:'Change locale',
 	bottom:20,
diff --git a/KitchenSink/Resources/examples/picker_date3.js b/KitchenSink/Resources/examples/picker_date3.js
index dc4ebf8..97f0b74 100644
--- a/KitchenSink/Resources/examples/picker_date3.js
+++ b/KitchenSink/Resources/examples/picker_date3.js
@@ -1,15 +1,15 @@
 var win = Titanium.UI.currentWindow;
 win.backgroundColor = 'black';
 
-var minDate = new Date()
+var minDate = new Date();
 minDate.setFullYear(2009);
 minDate.setMonth(0);
-minDate.setDate(1)
+minDate.setDate(1);
 
-var maxDate = new Date()
+var maxDate = new Date();
 maxDate.setFullYear(2009);
 maxDate.setMonth(11);
-maxDate.setDate(31)
+maxDate.setDate(31);
 
 var value = new Date();
 value.setFullYear(2009);
diff --git a/KitchenSink/Resources/examples/platform.js b/KitchenSink/Resources/examples/platform.js
index d9e6d82..ebc397e 100644
--- a/KitchenSink/Resources/examples/platform.js
+++ b/KitchenSink/Resources/examples/platform.js
@@ -17,21 +17,13 @@ function batteryStateToString(state)
 	switch (state)
 	{
 		case Titanium.Platform.BATTERY_STATE_UNKNOWN:
-		{
 			return 'unknown';
-		}
 		case Titanium.Platform.BATTERY_STATE_UNPLUGGED:
-		{
 			return 'unplugged';
-		}
 		case Titanium.Platform.BATTERY_STATE_CHARGING:
-		{
 			return 'charging';
-		}
 		case Titanium.Platform.BATTERY_STATE_FULL:
-		{
 			return 'full';
-		}
 	}
 	return '???';
 }
@@ -91,8 +83,7 @@ var l5 = Titanium.UI.createLabel({
 	width:'auto',
 	height:'auto',
 	font:{fontSize:14},
-	color:'#777',
-	height:'auto'
+	color:'#777'
 });
 
 win.add(l5);
@@ -167,8 +158,7 @@ var l12 = Titanium.UI.createLabel({
 	width:300,
 	height:'auto',
 	font:{fontSize:14},
-	color:'#777',
-	height:'auto'
+	color:'#777'
 });
 
 win.add(l12);
@@ -245,27 +235,22 @@ b.addEventListener('click', function()
 	switch(openURL)
 	{
 		case 0:
-		{
 			Titanium.Platform.openURL('http://www.google.com');
 			b.title='Open URL (web)';
 			openURL++;
 			break;
-		}
+
 		case 1:
-		{
 			Titanium.Platform.openURL('tel:4043332222');
 			b.title='Open URL (tel)';
 			openURL++;
 			break;
-		}
+
 		case 2:
-		{
 			Titanium.Platform.openURL('sms:4043332222');
 			b.title='Open URL (sms)';
 			openURL=0;
 			break;
-		}
-
 	}
 });
 
diff --git a/KitchenSink/Resources/examples/progress_bar.js b/KitchenSink/Resources/examples/progress_bar.js
index 4bf1b4c..242fc07 100644
--- a/KitchenSink/Resources/examples/progress_bar.js
+++ b/KitchenSink/Resources/examples/progress_bar.js
@@ -8,50 +8,9 @@ var b = Titanium.UI.createButton({
 });
 
 //
-// BUTTON LISTENER TO KICK OFF PROGRESS BARS
-//
-b.addEventListener('click', function()
-{
-	ind.show();
-	ind2.show();
-	ind3.show();
-	ind4.show();
-
-	var val = 0;
-	var interval = setInterval(function()
-	{
-		Ti.API.info('INTERVAL FIRED value ' + val);
-		if (val == 11)
-		{
-			clearInterval(interval);
-			ind.hide();
-			ind2.hide();
-			ind3.hide();
-			ind4.hide();
-			win.setToolbar(null,{animated:true});
-			win.setTitleControl(null);
-			win.setTitle('Progress Bar');
-			return;
-		}
-		ind.value = val;
-		ind.message = 'Downloading ' + val + ' of 10';
-		ind2.value = val;
-		ind2.message = 'Downloading ' + val + ' of 10';
-		ind3.value = val;
-		ind3.message = 'Downloading ' + val + ' of 10';
-		ind4.value = val;
-		ind4.message = 'Downloading ' + val + ' of 10';
-
-		val++;
-
-	},1000);
-});
-
-
-//
 // PLAIN STYLE INDICATOR
 //
-var ind=Titanium.UI.createProgressBar({
+var ind1=Titanium.UI.createProgressBar({
 	width:150,
 	min:0,
 	max:10,
@@ -64,7 +23,6 @@ var ind=Titanium.UI.createProgressBar({
 	top:60
 });
 
-
 //
 // BAR STYLE INDICATOR
 //
@@ -81,7 +39,6 @@ var ind2=Titanium.UI.createProgressBar({
 	top:120
 });
 
-
 //
 // PLACE INDICATOR IN NAV BAR
 //
@@ -110,10 +67,50 @@ var ind4=Titanium.UI.createProgressBar({
 	style:Titanium.UI.iPhone.ProgressBarStyle.PLAIN
 });
 
+//
+// BUTTON LISTENER TO KICK OFF PROGRESS BARS
+//
+b.addEventListener('click', function()
+{
+	ind1.show();
+	ind2.show();
+	ind3.show();
+	ind4.show();
+
+	var val = 0;
+	var interval = setInterval(function()
+	{
+		Ti.API.info('INTERVAL FIRED value ' + val);
+		if (val == 11)
+		{
+			clearInterval(interval);
+			ind1.hide();
+			ind2.hide();
+			ind3.hide();
+			ind4.hide();
+			win.setToolbar(null,{animated:true});
+			win.setTitleControl(null);
+			win.setTitle('Progress Bar');
+			return;
+		}
+		ind1.value = val;
+		ind1.message = 'Downloading ' + val + ' of 10';
+		ind2.value = val;
+		ind2.message = 'Downloading ' + val + ' of 10';
+		ind3.value = val;
+		ind3.message = 'Downloading ' + val + ' of 10';
+		ind4.value = val;
+		ind4.message = 'Downloading ' + val + ' of 10';
+
+		val++;
+
+	},1000);
+});
+
 if (Titanium.Platform.name == 'iPhone OS')
 {
 	win.add(b);
-	win.add(ind);
+	win.add(ind1);
 	win.add(ind2);
 	win.setTitleControl(ind3);
 	win.setToolbar([ind4]);
diff --git a/KitchenSink/Resources/examples/screenshot.js b/KitchenSink/Resources/examples/screenshot.js
index 0df7162..19a6e3a 100644
--- a/KitchenSink/Resources/examples/screenshot.js
+++ b/KitchenSink/Resources/examples/screenshot.js
@@ -13,7 +13,7 @@ win.add(imageView);
 Titanium.Media.takeScreenshot(function(event)
 {
 	// set blob on image view
-	imageView.image = event.media
+	imageView.image = event.media;
 	win.setBackgroundColor('red');
 
 	var a = Titanium.UI.createAlertDialog();
diff --git a/KitchenSink/Resources/examples/scroll_views.js b/KitchenSink/Resources/examples/scroll_views.js
index e41114f..5ab6148 100644
--- a/KitchenSink/Resources/examples/scroll_views.js
+++ b/KitchenSink/Resources/examples/scroll_views.js
@@ -4,8 +4,7 @@ var data = [
 	{title:'Scrolling Tabs', hasChild:true, test:'../examples/scroll_views_tabs.js'},
 	{title:'Scrollable View', hasChild:true, test:'../examples/scroll_views_scrollable.js'},
 	{title:'Many on a Screen', hasChild:true, test:'../examples/scroll_views_many.js'},
-	{title:'Scroll Views TextArea', hasChild:true, test:'../examples/scroll_views_textareas.js'},
-
+	{title:'Scroll Views TextArea', hasChild:true, test:'../examples/scroll_views_textareas.js'}
 ];
 
 // add iphone specific tests
@@ -38,7 +37,7 @@ tableview.addEventListener('click', function(e)
 		{
 			win.backgroundImage = e.rowData.bgImage;
 		}
-		Titanium.UI.currentTab.open(win,{animated:true})
+		Titanium.UI.currentTab.open(win,{animated:true});
 	}
 });
 
diff --git a/KitchenSink/Resources/examples/scroll_views_basic.js b/KitchenSink/Resources/examples/scroll_views_basic.js
index c637d4b..1cd5b83 100644
--- a/KitchenSink/Resources/examples/scroll_views_basic.js
+++ b/KitchenSink/Resources/examples/scroll_views_basic.js
@@ -1,4 +1,4 @@
-var win = Titanium.UI.currentWindow
+var win = Titanium.UI.currentWindow;
 
 var scrollView = Titanium.UI.createScrollView({
 	contentWidth:'auto',
diff --git a/KitchenSink/Resources/examples/scroll_views_many.js b/KitchenSink/Resources/examples/scroll_views_many.js
index 08e4926..681a783 100644
--- a/KitchenSink/Resources/examples/scroll_views_many.js
+++ b/KitchenSink/Resources/examples/scroll_views_many.js
@@ -1,4 +1,4 @@
-var win = Titanium.UI.currentWindow
+var win = Titanium.UI.currentWindow;
 
 //
 // SCROLL VIEW 1
@@ -31,7 +31,7 @@ var l1 = Ti.UI.createLabel({
 	width:'auto',
 	height:'auto'
 });
-view1.add(l1)
+view1.add(l1);
 scrollView1.add(view1);
 win.add(scrollView1);
 
@@ -66,7 +66,7 @@ var l2 = Ti.UI.createLabel({
 	width:'auto',
 	height:'auto'
 });
-view2.add(l2)
+view2.add(l2);
 scrollView2.add(view2);
 win.add(scrollView2);
 
@@ -108,7 +108,7 @@ if (Titanium.Platform.name == 'iPhone OS')
 		width:'auto',
 		height:'auto'
 	});
-	view3.add(l3)
+	view3.add(l3);
 	scrollView3.add(view3);
 	win.add(scrollView3);
 	
@@ -143,7 +143,7 @@ if (Titanium.Platform.name == 'iPhone OS')
 		width:'auto',
 		height:'auto'
 	});
-	view4.add(l4)
+	view4.add(l4);
 	scrollView4.add(view4);
 	win.add(scrollView4);
 }
diff --git a/KitchenSink/Resources/examples/scroll_views_scaling.js b/KitchenSink/Resources/examples/scroll_views_scaling.js
index 562e83b..51753dc 100644
--- a/KitchenSink/Resources/examples/scroll_views_scaling.js
+++ b/KitchenSink/Resources/examples/scroll_views_scaling.js
@@ -1,4 +1,4 @@
-var win = Titanium.UI.currentWindow
+var win = Titanium.UI.currentWindow;
 
 var scrollView = Titanium.UI.createScrollView({
 	contentWidth:'auto',
diff --git a/KitchenSink/Resources/examples/scroll_views_scrollable.js b/KitchenSink/Resources/examples/scroll_views_scrollable.js
index 90c78c2..85cb729 100644
--- a/KitchenSink/Resources/examples/scroll_views_scrollable.js
+++ b/KitchenSink/Resources/examples/scroll_views_scrollable.js
@@ -5,7 +5,7 @@ win.backgroundColor = '#ccc';
 win.orientationModes = [
 	Titanium.UI.PORTRAIT,
 	Titanium.UI.LANDSCAPE_LEFT,
-	Titanium.UI.LANDSCAPE_RIGHT,
+	Titanium.UI.LANDSCAPE_RIGHT
 ];
 
 
@@ -14,7 +14,6 @@ win.orientationModes = [
 //
 Ti.Gesture.addEventListener('orientationchange',function(e)
 {
-
 	// get orienation from event object
 	var orientation = getOrientation(e.orientation);
 });
@@ -69,7 +68,7 @@ var scrollView = Titanium.UI.createScrollableView({
 	showPagingControl:true,
 	pagingControlHeight:30,
 	maxZoomScale:2.0,
-	currentPage:1,
+	currentPage:1
 });
 
 win.add(scrollView);
@@ -79,7 +78,7 @@ var activeView = view1;
 
 scrollView.addEventListener('scroll', function(e)
 {
-    activeView = e.view  // the object handle to the view that is about to become visible
+    activeView = e.view;  // the object handle to the view that is about to become visible
 	i = e.currentPage;
 	Titanium.API.info("scroll called - current index " + i + ' active view ' + activeView);
 });
@@ -145,13 +144,12 @@ change.addEventListener('click',function()
 	{
 		if (x==i)
 		{
-			Ti.API.info('SETTING TO NEW VIEW ' + x)
-			ar[x] = newView
+			Ti.API.info('SETTING TO NEW VIEW ' + x);
+			ar[x] = newView;
 		}
 		else
 		{
-			Ti.API.info('SETTING TO OLD VIEW ' + x)
-
+			Ti.API.info('SETTING TO OLD VIEW ' + x);
 			ar[x] = scrollView.views[x];
 		}
 	}
@@ -164,9 +162,12 @@ var left = Titanium.UI.createButton({
 });
 left.addEventListener('click', function(e)
 {
-	if (i == 0) return;
+	if (i == 0)
+	{
+		return;
+	}
 	i--;
-	scrollView.scrollToView(i)
+	scrollView.scrollToView(i);
 });
 
 // move scroll view right
@@ -175,7 +176,10 @@ var right = Titanium.UI.createButton({
 });
 right.addEventListener('click', function(e)
 {
-	if (i == (scrollView.views.length-1)) return;
+	if (i == (scrollView.views.length-1))
+	{
+		return;
+	}
 	i++;
 	scrollView.scrollToView(scrollView.views[i]);
 });
@@ -204,7 +208,7 @@ else
 		width:320,
 		height: 'auto',
 		opacity: 0
-	})
+	});
 
 	toolbar.add(floater);
 
diff --git a/KitchenSink/Resources/examples/scroll_views_tabs.js b/KitchenSink/Resources/examples/scroll_views_tabs.js
index d5dd40b..39fc372 100644
--- a/KitchenSink/Resources/examples/scroll_views_tabs.js
+++ b/KitchenSink/Resources/examples/scroll_views_tabs.js
@@ -1,4 +1,4 @@
-var win = Titanium.UI.currentWindow
+var win = Titanium.UI.currentWindow;
 win.backgroundColor = '#000';
 
 var leftImage = Ti.UI.createView({
@@ -29,7 +29,7 @@ var scrollView = Titanium.UI.createScrollView({
 	height:50,
 	width:230,
 	borderRadius:10,
-	backgroundColor:'#13386c',
+	backgroundColor:'#13386c'
 
 });
 
@@ -225,8 +225,7 @@ var scrollView2 = Titanium.UI.createScrollView({
 win.add(scrollView2);
 scrollView2.addEventListener('scroll', function(e)
 {
-	for(v in e)
-	{
+	for(var v in e)	{
 		Ti.API.info('v ' + v + ' e[v] ' + e[v]);
 	}
 });
diff --git a/KitchenSink/Resources/examples/scroll_views_without_clipping.js b/KitchenSink/Resources/examples/scroll_views_without_clipping.js
index 391a62f..f202351 100644
--- a/KitchenSink/Resources/examples/scroll_views_without_clipping.js
+++ b/KitchenSink/Resources/examples/scroll_views_without_clipping.js
@@ -95,7 +95,7 @@ var tableview3 = Titanium.UI.createTableView({
 	backgroundColor:'transparent',
 	separatorStyle:0,
 	transform:t3,
-	visible:true,
+	visible:true
 
 });
 
@@ -122,10 +122,18 @@ var scrollView = Titanium.UI.createScrollableView({
 	top:10,
 	left:30,
 	right:30,
-	height:330,
+	height:330
 });
 win.add(scrollView);
 
+function showTableView()
+{
+	tableview.visible=true;
+	scrollView.visible=false;
+	var t = Ti.UI.create2DMatrix();
+	tableview.animate({transform:t,duration:100});
+}
+
 iv1.addEventListener('singletap', function()
 {
 	showTableView();
@@ -139,13 +147,4 @@ iv3.addEventListener('singletap', function()
 	showTableView();
 });
 
-function showTableView()
-{
-	tableview.visible=true;
-	scrollView.visible=false;
-	var t = Ti.UI.create2DMatrix();
-	tableview.animate({transform:t,duration:100});
-	
-};
-
 
diff --git a/KitchenSink/Resources/examples/searchbar.js b/KitchenSink/Resources/examples/searchbar.js
index 0a4e06e..d3f0e96 100644
--- a/KitchenSink/Resources/examples/searchbar.js
+++ b/KitchenSink/Resources/examples/searchbar.js
@@ -4,7 +4,7 @@ var search = Titanium.UI.createSearchBar({
 	barColor:'#000', 
 	showCancel:true,
 	height:43,
-	top:0,
+	top:0
 });
 
 win.add(search);
@@ -54,7 +54,7 @@ var b3 = Titanium.UI.createButton({
 win.add(b3);
 b3.addEventListener('click', function()
 {
-	search.showCancel = (search.showCancel==true)?false:true;
+	search.showCancel = (!search.showCancel);
 });
 
 //
@@ -117,9 +117,9 @@ search.addEventListener('return', function(e)
 });
 search.addEventListener('focus', function(e)
 {
-   	Titanium.API.info('search bar: focus received')
+   	Titanium.API.info('search bar: focus received');
 });
 search.addEventListener('blur', function(e)
 {
-   	Titanium.API.info('search bar:blur received')
+   	Titanium.API.info('search bar:blur received');
 });
diff --git a/KitchenSink/Resources/examples/set_timeout.js b/KitchenSink/Resources/examples/set_timeout.js
index bb3d245..9f5d5d2 100644
--- a/KitchenSink/Resources/examples/set_timeout.js
+++ b/KitchenSink/Resources/examples/set_timeout.js
@@ -8,7 +8,7 @@ var label = Ti.UI.createLabel({
 });
 
 var act = Ti.UI.createActivityIndicator({
-	bottom:10,
+	bottom:10
 });
 act.style = Titanium.UI.iPhone.ActivityIndicatorStyle.DARK;
 act.font = {fontFamily:'Helvetica Neue', fontSize:15,fontWeight:'bold'};
diff --git a/KitchenSink/Resources/examples/slider.js b/KitchenSink/Resources/examples/slider.js
index 2fbce75..56ab344 100644
--- a/KitchenSink/Resources/examples/slider.js
+++ b/KitchenSink/Resources/examples/slider.js
@@ -212,7 +212,7 @@ titleButton.addEventListener('click', function()
 win.add(basicSliderLabel);
 win.add(basicSlider);
 win.add(toggleButton);
-Ti.API.info('platform = ' + Titanium.Platform.osname)
+Ti.API.info('platform = ' + Titanium.Platform.osname);
 if (Titanium.Platform.osname == 'iphone' || Titanium.Platform.osname == 'ipad')
 {
 	win.add(navbarButton);
diff --git a/KitchenSink/Resources/examples/soap_client_library.js b/KitchenSink/Resources/examples/soap_client_library.js
index d853141..7c0fc79 100644
--- a/KitchenSink/Resources/examples/soap_client_library.js
+++ b/KitchenSink/Resources/examples/soap_client_library.js
@@ -94,8 +94,8 @@ SOAPClient._loadWsdl = function(url, method, parameters, async, callback)
 	};
 	xmlHttp.onerror = function(e)
 	{
-		Ti.API.error('WSDL ERROR ' + e)
-	}
+		Ti.API.error('WSDL ERROR ' + e);
+	};
 	xmlHttp.send(null);
 
 	// if (!async)
@@ -230,7 +230,6 @@ SOAPClient._node2object = function(node, wsdl)
 		}
 		return l;
 	}
-	return null;
 };
 
 SOAPClient._extractValue = function(node, wsdl)
diff --git a/KitchenSink/Resources/examples/sockets.js b/KitchenSink/Resources/examples/sockets.js
index dd6ee52..6e5f123 100644
--- a/KitchenSink/Resources/examples/sockets.js
+++ b/KitchenSink/Resources/examples/sockets.js
@@ -27,7 +27,7 @@ win.add(readLabel);
 
 socket.addEventListener('read', function(e) {
 	messageLabel.text = "I'm a reader!";
-	readLabel.text = e['from'] + ':' + e['data'].text;
+	readLabel.text = e.from + ':' + e.data.text;
 });
 
 var connectButton = Titanium.UI.createButton({
diff --git a/KitchenSink/Resources/examples/sound_file.js b/KitchenSink/Resources/examples/sound_file.js
index edf1b20..3f9e517 100644
--- a/KitchenSink/Resources/examples/sound_file.js
+++ b/KitchenSink/Resources/examples/sound_file.js
@@ -5,6 +5,12 @@ var file = Titanium.Filesystem.getFile(Titanium.Filesystem.resourcesDirectory,'c
 // load from file object
 var sound = Titanium.Media.createSound({sound:file});
 
+var pb = Titanium.UI.createProgressBar({
+	min:0,
+	value:0,
+	width:200
+});
+
 //
 // PLAY
 //
@@ -110,13 +116,16 @@ volumeDown.addEventListener('click', function()
 	if (sound.volume > 0)
 	{
 		if (sound.volume < 0.1)
+    	{
 			sound.volume = 0;
+    	}
 		else
+    	{
 			sound.volume -= 0.1;
+    	}
 		volumeDown.title = 'Volume-- (' + String(sound.volume).substring(0,3) + ')';
 		volumeUp.title = 'Volume++';
 	}
-
 });
 
 win.add(volumeUp);
@@ -134,7 +143,7 @@ var looping = Titanium.UI.createButton({
 });
 looping.addEventListener('click', function()
 {
-	sound.looping = (sound.looping==false)?true:false;
+	sound.looping = (!sound.looping);
 	looping.title = 'Looping (' + sound.looping + ')';
 });
 win.add(looping);
@@ -157,11 +166,6 @@ sound.addEventListener('resume', function()
 var flexSpace = Titanium.UI.createButton({
 	systemButton:Titanium.UI.iPhone.SystemButton.FLEXIBLE_SPACE
 });
-var pb = Titanium.UI.createProgressBar({
-	min:0,
-	value:0,
-	width:200
-});
 
 win.setToolbar([flexSpace,pb,flexSpace]);
 pb.show();
@@ -173,7 +177,7 @@ var i = setInterval(function()
 {
 	if (sound.isPlaying())
 	{
-		Ti.API.info('time ' + sound.time)
+		Ti.API.info('time ' + sound.time);
 		pb.value = sound.time;
 
 	}
diff --git a/KitchenSink/Resources/examples/sound_file_url.js b/KitchenSink/Resources/examples/sound_file_url.js
index 9f760f9..25dc609 100644
--- a/KitchenSink/Resources/examples/sound_file_url.js
+++ b/KitchenSink/Resources/examples/sound_file_url.js
@@ -5,6 +5,12 @@ var file = Titanium.Filesystem.getFile(Titanium.Filesystem.resourcesDirectory,'c
 // load from file object but use the nativepath
 var sound = Titanium.Media.createSound({url:file.nativePath});
 
+var pb = Titanium.UI.createProgressBar({
+	min:0,
+	value:0,
+	width:200
+});
+
 //
 // PLAY
 //
@@ -74,7 +80,7 @@ stop.addEventListener('click', function()
 win.add(stop);
 
 //
-// VOLUME +
+// VOLUME +, -
 //
 var volumeUp = Titanium.UI.createButton({
 	title:'Volume++',
@@ -83,6 +89,15 @@ var volumeUp = Titanium.UI.createButton({
 	left:10,
 	top:110
 });
+
+var volumeDown = Titanium.UI.createButton({
+	title:'Volume--',
+	height:40,
+	width:145,
+	right:10,
+	top:110
+});
+
 volumeUp.addEventListener('click', function()
 {
 	if (sound.volume < 1.0)
@@ -94,28 +109,21 @@ volumeUp.addEventListener('click', function()
 });
 win.add(volumeUp);
 
-//
-// VOLUME -
-//
-var volumeDown = Titanium.UI.createButton({
-	title:'Volume--',
-	height:40,
-	width:145,
-	right:10,
-	top:110
-});
 volumeDown.addEventListener('click', function()
 {
 	if (sound.volume > 0)
 	{
 		if (sound.volume < 0.1)
+		{
 			sound.volume = 0;
+		}
 		else
+		{
 			sound.volume -= 0.1;
+		}
 		volumeDown.title = 'Volume-- (' + String(sound.volume).substring(0,3) + ')';
 		volumeUp.title = 'Volume++';
 	}
-
 });
 win.add(volumeDown);
 
@@ -131,7 +139,7 @@ var looping = Titanium.UI.createButton({
 });
 looping.addEventListener('click', function()
 {
-	sound.looping = (sound.looping==false)?true:false;
+	sound.looping = (!sound.looping);
 	looping.title = 'Looping (' + sound.isLooping() + ')';
 });
 win.add(looping);
@@ -154,11 +162,6 @@ sound.addEventListener('resume', function()
 var flexSpace = Titanium.UI.createButton({
 	systemButton:Titanium.UI.iPhone.SystemButton.FLEXIBLE_SPACE
 });
-var pb = Titanium.UI.createProgressBar({
-	min:0,
-	value:0,
-	width:200
-});
 
 win.setToolbar([flexSpace,pb,flexSpace]);
 pb.show();
@@ -170,7 +173,7 @@ var i = setInterval(function()
 {
 	if (sound.isPlaying())
 	{
-		Ti.API.info('time ' + sound.time)
+		Ti.API.info('time ' + sound.time);
 		pb.value = sound.time;
 
 	}
diff --git a/KitchenSink/Resources/examples/sound_local.js b/KitchenSink/Resources/examples/sound_local.js
index c7f2b8c..d845f09 100644
--- a/KitchenSink/Resources/examples/sound_local.js
+++ b/KitchenSink/Resources/examples/sound_local.js
@@ -9,6 +9,12 @@ var sound = Titanium.Media.createSound({
 	url:'../cricket.wav'
 });
 
+var pb = Titanium.UI.createProgressBar({
+	min:0,
+	value:0,
+	width:200
+});
+
 //
 // PLAY
 //
@@ -78,7 +84,7 @@ stop.addEventListener('click', function()
 win.add(stop);
 
 //
-// VOLUME +
+// VOLUME +, -
 //
 var volumeUp = Titanium.UI.createButton({
 	title:'Volume++',
@@ -87,6 +93,15 @@ var volumeUp = Titanium.UI.createButton({
 	left:10,
 	top:110
 });
+
+var volumeDown = Titanium.UI.createButton({
+	title:'Volume--',
+	height:40,
+	width:145,
+	right:10,
+	top:110
+});
+
 volumeUp.addEventListener('click', function()
 {
 	if (sound.volume < 1.0)
@@ -98,24 +113,18 @@ volumeUp.addEventListener('click', function()
 });
 win.add(volumeUp);
 
-//
-// VOLUME -
-//
-var volumeDown = Titanium.UI.createButton({
-	title:'Volume--',
-	height:40,
-	width:145,
-	right:10,
-	top:110
-});
 volumeDown.addEventListener('click', function()
 {
 	if (sound.volume > 0)
 	{
 		if (sound.volume < 0.1)
+		{
 			sound.volume = 0;
+		}
 		else
+		{
 			sound.volume -= 0.1;
+		}
 		volumeDown.title = 'Volume-- (' + String(sound.volume).substring(0,3) + ')';
 		volumeUp.title = 'Volume++';
 	}
@@ -135,7 +144,7 @@ var looping = Titanium.UI.createButton({
 });
 looping.addEventListener('click', function()
 {
-	sound.looping = (sound.looping==false)?true:false;
+	sound.looping = (!sound.looping);
 	looping.title = 'Looping (' + sound.isLooping() + ')';
 });
 win.add(looping);
@@ -200,11 +209,6 @@ sound.addEventListener('resume', function()
 var flexSpace = Titanium.UI.createButton({
 	systemButton:Titanium.UI.iPhone.SystemButton.FLEXIBLE_SPACE
 });
-var pb = Titanium.UI.createProgressBar({
-	min:0,
-	value:0,
-	width:200
-});
 
 win.setToolbar([flexSpace,pb,flexSpace]);
 pb.show();
diff --git a/KitchenSink/Resources/examples/sound_record.js b/KitchenSink/Resources/examples/sound_record.js
index 17c9cc5..d1dce93 100644
--- a/KitchenSink/Resources/examples/sound_record.js
+++ b/KitchenSink/Resources/examples/sound_record.js
@@ -12,13 +12,6 @@ var recording = Ti.Media.createAudioRecorder();
 recording.compression = Ti.Media.AUDIO_FORMAT_ULAW;
 recording.format = Ti.Media.AUDIO_FILEFORMAT_WAVE;
 
-Ti.Media.addEventListener('recordinginput', function(e) {
-	Ti.API.info('Input availability changed: '+e.available);
-	if (!e.available && recording.recording) {
-		b1.fireEvent('click', {});
-	}
-});
-
 var file;
 var timer;
 var sound;
@@ -111,6 +104,14 @@ var b1 = Titanium.UI.createButton({
 	height:40,
 	top:20
 });
+
+var b2 = Titanium.UI.createButton({
+	title:'Playback Recording',
+	width:200,
+	height:40,
+	top:80
+});
+
 b1.addEventListener('click', function()
 {
 	if (recording.recording)
@@ -139,15 +140,8 @@ b1.addEventListener('click', function()
 	}
 });
 win.add(b1);
-
-var b2 = Titanium.UI.createButton({
-	title:'Playback Recording',
-	width:200,
-	height:40,
-	top:80
-});
-
 win.add(b2);
+
 b2.addEventListener('click', function()
 {
 	if (sound && sound.playing)
@@ -180,7 +174,7 @@ var switchLabel = Titanium.UI.createLabel({
 });
 var switcher = Titanium.UI.createSwitch({
 	value:false,
-	bottom:80,
+	bottom:80
 });
 
 switcher.addEventListener('change',function(e)
@@ -196,3 +190,11 @@ switcher.addEventListener('change',function(e)
 });
 win.add(switchLabel);
 win.add(switcher);
+
+Ti.Media.addEventListener('recordinginput', function(e) {
+	Ti.API.info('Input availability changed: '+e.available);
+	if (!e.available && recording.recording) {
+		b1.fireEvent('click', {});
+	}
+});
+
diff --git a/KitchenSink/Resources/examples/sound_remote_url.js b/KitchenSink/Resources/examples/sound_remote_url.js
index 4bf1f52..a439978 100644
--- a/KitchenSink/Resources/examples/sound_remote_url.js
+++ b/KitchenSink/Resources/examples/sound_remote_url.js
@@ -5,6 +5,12 @@ var url = "http://www.nch.com.au/acm/8kmp38.wav";
 // load from remote url
 var sound = Titanium.Media.createSound({url:url,preload:true});
 
+var pb = Titanium.UI.createProgressBar({
+	min:0,
+	value:0,
+	width:200
+});
+
 //
 // PLAY
 //
@@ -74,7 +80,7 @@ stop.addEventListener('click', function()
 win.add(stop);
 
 //
-// VOLUME +
+// VOLUME +, -
 //
 var volumeUp = Titanium.UI.createButton({
 	title:'Volume++',
@@ -83,6 +89,15 @@ var volumeUp = Titanium.UI.createButton({
 	left:10,
 	top:110
 });
+
+var volumeDown = Titanium.UI.createButton({
+	title:'Volume--',
+	height:40,
+	width:145,
+	right:10,
+	top:110
+});
+
 volumeUp.addEventListener('click', function()
 {
 	if (sound.volume < 1.0)
@@ -94,28 +109,21 @@ volumeUp.addEventListener('click', function()
 });
 win.add(volumeUp);
 
-//
-// VOLUME -
-//
-var volumeDown = Titanium.UI.createButton({
-	title:'Volume--',
-	height:40,
-	width:145,
-	right:10,
-	top:110
-});
 volumeDown.addEventListener('click', function()
 {
 	if (sound.volume > 0)
 	{
 		if (sound.volume < 0.1)
+		{
 			sound.volume = 0;
+		}
 		else
+		{
 			sound.volume -= 0.1;
+		}
 		volumeDown.title = 'Volume-- (' + String(sound.volume).substring(0,3) + ')';
 		volumeUp.title = 'Volume++';
 	}
-
 });
 win.add(volumeDown);
 
@@ -131,7 +139,7 @@ var looping = Titanium.UI.createButton({
 });
 looping.addEventListener('click', function()
 {
-	sound.looping = (sound.isLooping()==false)?true:false;
+	sound.looping = (!sound.isLooping());
 	looping.title = 'Looping (' + sound.isLooping() + ')';
 });
 win.add(looping);
@@ -142,7 +150,6 @@ win.add(looping);
 sound.addEventListener('complete', function()
 {
 	Titanium.API.info('COMPLETE CALLED');
-
 	pb.value = 0;
 });
 sound.addEventListener('resume', function()
@@ -156,11 +163,6 @@ sound.addEventListener('resume', function()
 var flexSpace = Titanium.UI.createButton({
 	systemButton:Titanium.UI.iPhone.SystemButton.FLEXIBLE_SPACE
 });
-var pb = Titanium.UI.createProgressBar({
-	min:0,
-	value:0,
-	width:200,
-});
 
 win.setToolbar([flexSpace,pb,flexSpace]);
 pb.show();
@@ -172,9 +174,8 @@ var i = setInterval(function()
 {
 	if (sound.isPlaying())
 	{
-		Ti.API.info('time ' + sound.time)
+		Ti.API.info('time ' + sound.time);
 		pb.value = sound.time;
-
 	}
 },500);
 
diff --git a/KitchenSink/Resources/examples/sound_session_mode.js b/KitchenSink/Resources/examples/sound_session_mode.js
index 68d757f..3b75a64 100644
--- a/KitchenSink/Resources/examples/sound_session_mode.js
+++ b/KitchenSink/Resources/examples/sound_session_mode.js
@@ -1,11 +1,28 @@
 var win = Titanium.UI.currentWindow;
 
 var count = 0;
+var audio = Ti.Media.createAudioPlayer({url:'http://202.6.74.107:8060/triplej.mp3'});
+var sound = Titanium.Media.createSound({url:'../cricket.wav'});
+var modeArray = [
+	{mode:Ti.Media.AUDIO_SESSION_MODE_SOLO_AMBIENT,desc:'Solo Ambient Mode'},
+	{mode:Ti.Media.AUDIO_SESSION_MODE_AMBIENT,desc:'Ambient Mode'},
+	{mode:Ti.Media.AUDIO_SESSION_MODE_PLAYBACK,desc:'Playback Mode'},
+	{mode:Ti.Media.AUDIO_SESSION_MODE_RECORD,desc:'Record Mode'},
+	{mode:Ti.Media.AUDIO_SESSION_MODE_PLAY_AND_RECORD,desc:'Play and Record Mode'}
+];
+
 
 // Need this so that any sound which is playing when we come in continues to
 // do so
 Titanium.Media.defaultAudioSessionMode = Ti.Media.AUDIO_SESSION_MODE_AMBIENT;
 
+var l = Ti.UI.createLabel({
+	text:'Play sounds to toggle audio mode - try running this test when you have the iPod playing!',
+	top:210,
+	width:300,
+	height:30
+});
+
 var startAudio = Titanium.UI.createButton({
 	title:'Toggle Audio Session Mode',
 	top:10,
@@ -14,11 +31,18 @@ var startAudio = Titanium.UI.createButton({
 });
 startAudio.addEventListener('click', function()
 {
-	if (count == 4)count=0; else count++
+	if (count == 4)
+	{
+		count=0;
+	}
+	else
+	{
+		count++;
+	}
 	Ti.API.info('playing audio with mode ' + modeArray[count].desc + ' count ' + count);
 	audio.audioSessionMode = modeArray[count].mode;
-	l.text = modeArray[count].desc
-	audio.start()
+	l.text = modeArray[count].desc;
+	audio.start();
 });
 
 var stopAudio = Titanium.UI.createButton({
@@ -40,12 +64,18 @@ var startSound = Titanium.UI.createButton({
 });
 startSound.addEventListener('click', function()
 {
-	if (count == 4)count=0; else count++
+	if (count == 4)
+	{
+		count=0;
+	}
+	else
+	{
+		count++;
+	}
 	Ti.API.info('playing sound with mode ' + modeArray[count].desc + ' count ' + count);
 	sound.audioSessionMode = modeArray[count].mode;
 	l.text = modeArray[count].desc;
-	sound.play()
-	
+	sound.play();
 });
 
 var stopSound = Titanium.UI.createButton({
@@ -56,14 +86,7 @@ var stopSound = Titanium.UI.createButton({
 });
 stopSound.addEventListener('click', function()
 {
-	sound.stop()
-});
-
-var l = Ti.UI.createLabel({
-	text:'Play sounds to toggle audio mode - try running this test when you have the iPod playing!',
-	top:210,
-	width:300,
-	height:30
+	sound.stop();
 });
 
 win.add(startAudio);
@@ -71,15 +94,3 @@ win.add(stopAudio);
 win.add(startSound);
 win.add(stopSound);
 win.add(l);
-
-var modeArray = [
-	{mode:Ti.Media.AUDIO_SESSION_MODE_SOLO_AMBIENT,desc:'Solo Ambient Mode'},
-	{mode:Ti.Media.AUDIO_SESSION_MODE_AMBIENT,desc:'Ambient Mode'},
-	{mode:Ti.Media.AUDIO_SESSION_MODE_PLAYBACK,desc:'Playback Mode'},
-	{mode:Ti.Media.AUDIO_SESSION_MODE_RECORD,desc:'Record Mode'},
-	{mode:Ti.Media.AUDIO_SESSION_MODE_PLAY_AND_RECORD,desc:'Play and Record Mode'}
-];
-
-var audio = Ti.Media.createAudioPlayer({url:'http://202.6.74.107:8060/triplej.mp3'});
-var sound = Titanium.Media.createSound({url:'../cricket.wav'});
-
diff --git a/KitchenSink/Resources/examples/statusbar.js b/KitchenSink/Resources/examples/statusbar.js
index f603d2b..312cdeb 100644
--- a/KitchenSink/Resources/examples/statusbar.js
+++ b/KitchenSink/Resources/examples/statusbar.js
@@ -35,29 +35,24 @@ b2.addEventListener('click', function()
 	switch(style)
 	{
 		case 0:
-		{
 			Titanium.UI.iPhone.statusBarStyle = Titanium.UI.iPhone.StatusBar.OPAQUE_BLACK;
 			style++;
 			break;
-		}
+
 		case 1:
-		{
 			Titanium.UI.iPhone.statusBarStyle = Titanium.UI.iPhone.StatusBar.GRAY;
 			style++;
 			break;
-		}
+
 		case 2:
-		{
 			Titanium.UI.iPhone.statusBarStyle = Titanium.UI.iPhone.StatusBar.TRANSLUCENT_BLACK;
 			style++;
 			break;
-		}
+
 		case 3:
-		{
 			Titanium.UI.iPhone.statusBarStyle = Titanium.UI.iPhone.StatusBar.DEFAULT;
 			style=0;
 			break;
-		}
 	}
 });
 win.add(b2);
\ No newline at end of file
diff --git a/KitchenSink/Resources/examples/switch.js b/KitchenSink/Resources/examples/switch.js
index ea0b1f0..a374f22 100644
--- a/KitchenSink/Resources/examples/switch.js
+++ b/KitchenSink/Resources/examples/switch.js
@@ -17,7 +17,7 @@ var basicSwitchLabel = Titanium.UI.createLabel({
 
 var basicSwitch = Titanium.UI.createSwitch({
 	value:false,
-	top:30,
+	top:30
 });
 
 basicSwitch.addEventListener('change',function(e)
@@ -36,14 +36,7 @@ var changeButton = Titanium.UI.createButton({
 });
 changeButton.addEventListener('click', function()
 {
-	if (basicSwitch.value == false)
-	{
-		basicSwitch.value = true;
-	}
-	else
-	{
-		basicSwitch.value = false;
-	}
+	basicSwitch.value = !basicSwitch.value;
 });
 
 //
@@ -58,7 +51,7 @@ var hideShowButton = Titanium.UI.createButton({
 var hidden=false;
 hideShowButton.addEventListener('click', function()
 {
-	if (hidden==true)
+	if (hidden)
 	{
 		basicSwitch.show();
 		hidden=false;
@@ -85,15 +78,15 @@ toolbarButton.addEventListener('click', function()
 	if (!inToolbar)
 	{
 		var toolbarSwitch = Titanium.UI.createSwitch({
-			value:false,
+			value:false
 		});
-		win.setToolbar([toolbarSwitch])
+		win.setToolbar([toolbarSwitch]);
 		inToolbar = true;
 	}
 	else
 	{
 		inToolbar = false;
-		win.setToolbar(null,{animated:true})
+		win.setToolbar(null,{animated:true});
 	}
 });
 
@@ -147,7 +140,7 @@ titleButton.addEventListener('click', function()
 	else
 	{
 		var titleSwitch = Titanium.UI.createSwitch({
-			value:false,
+		  value:false
 		});
 		win.titleControl = titleSwitch;
 		inTitle=true;
diff --git a/KitchenSink/Resources/examples/system_buttons.js b/KitchenSink/Resources/examples/system_buttons.js
index 4a66380..fbc5adc 100644
--- a/KitchenSink/Resources/examples/system_buttons.js
+++ b/KitchenSink/Resources/examples/system_buttons.js
@@ -13,7 +13,7 @@ var fixedSpace = Titanium.UI.createButton({
 
 // system buttons
 var action = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.ACTION,
+	systemButton:Titanium.UI.iPhone.SystemButton.ACTION
 });
 action.addEventListener('click', function()
 {
@@ -21,7 +21,7 @@ action.addEventListener('click', function()
 });
 
 var camera = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.CAMERA,
+	systemButton:Titanium.UI.iPhone.SystemButton.CAMERA
 });
 camera.addEventListener('click', function()
 {
@@ -29,7 +29,7 @@ camera.addEventListener('click', function()
 });
 
 var compose = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.COMPOSE,
+	systemButton:Titanium.UI.iPhone.SystemButton.COMPOSE
 });
 compose.addEventListener('click', function()
 {
@@ -37,7 +37,7 @@ compose.addEventListener('click', function()
 });
 
 var bookmarks = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.BOOKMARKS,
+	systemButton:Titanium.UI.iPhone.SystemButton.BOOKMARKS
 });
 bookmarks.addEventListener('click', function()
 {
@@ -45,7 +45,7 @@ bookmarks.addEventListener('click', function()
 });
 
 var search = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.SEARCH,
+	systemButton:Titanium.UI.iPhone.SystemButton.SEARCH
 });
 search.addEventListener('click', function()
 {
@@ -53,7 +53,7 @@ search.addEventListener('click', function()
 });
 
 var add = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.ADD,
+	systemButton:Titanium.UI.iPhone.SystemButton.ADD
 });
 add.addEventListener('click', function()
 {
@@ -61,7 +61,7 @@ add.addEventListener('click', function()
 });
 
 var trash = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.TRASH,
+	systemButton:Titanium.UI.iPhone.SystemButton.TRASH
 });
 trash.addEventListener('click', function()
 {
@@ -69,7 +69,7 @@ trash.addEventListener('click', function()
 });
 
 var reply = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.REPLY,
+	systemButton:Titanium.UI.iPhone.SystemButton.REPLY
 });
 reply.addEventListener('click', function()
 {
@@ -77,7 +77,7 @@ reply.addEventListener('click', function()
 });
 
 var stop = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.STOP,
+	systemButton:Titanium.UI.iPhone.SystemButton.STOP
 });
 stop.addEventListener('click', function()
 {
@@ -85,7 +85,7 @@ stop.addEventListener('click', function()
 });
 
 var refresh = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.REFRESH,
+	systemButton:Titanium.UI.iPhone.SystemButton.REFRESH
 });
 refresh.addEventListener('click', function()
 {
@@ -93,7 +93,7 @@ refresh.addEventListener('click', function()
 });
 
 var play = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.PLAY,
+	systemButton:Titanium.UI.iPhone.SystemButton.PLAY
 });
 play.addEventListener('click', function()
 {
@@ -101,7 +101,7 @@ play.addEventListener('click', function()
 });
 
 var pause = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.PAUSE,
+	systemButton:Titanium.UI.iPhone.SystemButton.PAUSE
 });
 pause.addEventListener('click', function()
 {
@@ -109,7 +109,7 @@ pause.addEventListener('click', function()
 });
 
 var fastforward = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.FAST_FORWARD,
+	systemButton:Titanium.UI.iPhone.SystemButton.FAST_FORWARD
 });
 fastforward.addEventListener('click', function()
 {
@@ -117,7 +117,7 @@ fastforward.addEventListener('click', function()
 });
 
 var rewind = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.REWIND,
+	systemButton:Titanium.UI.iPhone.SystemButton.REWIND
 });
 rewind.addEventListener('click', function()
 {
@@ -125,7 +125,7 @@ rewind.addEventListener('click', function()
 });
 
 var edit = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.EDIT,
+	systemButton:Titanium.UI.iPhone.SystemButton.EDIT
 });
 edit.addEventListener('click', function()
 {
@@ -133,7 +133,7 @@ edit.addEventListener('click', function()
 });
 
 var cancel = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.CANCEL,
+	systemButton:Titanium.UI.iPhone.SystemButton.CANCEL
 });
 cancel.addEventListener('click', function()
 {
@@ -141,7 +141,7 @@ cancel.addEventListener('click', function()
 });
 
 var save = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.SAVE,
+	systemButton:Titanium.UI.iPhone.SystemButton.SAVE
 });
 save.addEventListener('click', function()
 {
@@ -149,7 +149,7 @@ save.addEventListener('click', function()
 });
 
 var organize = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.ORGANIZE,
+	systemButton:Titanium.UI.iPhone.SystemButton.ORGANIZE
 });
 organize.addEventListener('click', function()
 {
@@ -157,7 +157,7 @@ organize.addEventListener('click', function()
 });
 
 var done = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.DONE,
+	systemButton:Titanium.UI.iPhone.SystemButton.DONE
 });
 done.addEventListener('click', function()
 {
@@ -165,16 +165,16 @@ done.addEventListener('click', function()
 });
 
 var disclosure = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.DISCLOSURE,
+	systemButton:Titanium.UI.iPhone.SystemButton.DISCLOSURE
 });
 disclosure.addEventListener('click', function()
 {
-	Ti.API.info('FOO')
+	Ti.API.info('FOO');
 	Titanium.UI.createAlertDialog({title:'System Button', message:'DISCLOSURE'}).show();
 });
 
 var contactadd = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.CONTACT_ADD,
+	systemButton:Titanium.UI.iPhone.SystemButton.CONTACT_ADD
 });
 contactadd.addEventListener('click', function()
 {
@@ -182,7 +182,7 @@ contactadd.addEventListener('click', function()
 });
 
 var nativespinner = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.SPINNER,
+	systemButton:Titanium.UI.iPhone.SystemButton.SPINNER
 });
 nativespinner.addEventListener('click', function()
 {
@@ -190,7 +190,7 @@ nativespinner.addEventListener('click', function()
 });
 
 var infolight = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.INFO_LIGHT,
+	systemButton:Titanium.UI.iPhone.SystemButton.INFO_LIGHT
 });
 infolight.addEventListener('click', function()
 {
@@ -198,7 +198,7 @@ infolight.addEventListener('click', function()
 });
 
 var infodark = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.INFO_DARK,
+	systemButton:Titanium.UI.iPhone.SystemButton.INFO_DARK
 });
 infodark.addEventListener('click', function()
 {
diff --git a/KitchenSink/Resources/examples/tab_groups.js b/KitchenSink/Resources/examples/tab_groups.js
index 0f49602..fa6db7e 100644
--- a/KitchenSink/Resources/examples/tab_groups.js
+++ b/KitchenSink/Resources/examples/tab_groups.js
@@ -28,8 +28,8 @@ addTabButton.addEventListener('click', function(e)
 	}
 	else
 	{
-		var newtab = tabGroup.tabs[5];
-		tabGroup.removeTab(newtab);
+		var tab5 = tabGroup.tabs[5];
+		tabGroup.removeTab(tab5);
 	}
 });
 
@@ -48,12 +48,11 @@ var transformed = false;
 // create button event listener
 animateTabButton.addEventListener('click', function(e)
 {
-	if (transformed == false)
+	if (!transformed)
 	{
-		var transform = Ti.UI.create2DMatrix();
-		transform = transform.scale(0.6);
-		transform = transform.rotate(45);
-		tabGroup.animate({transform:transform,duration:1000});
+		var tf = Ti.UI.create2DMatrix();
+		tf = tf.scale(0.6).rotate(45);
+		tabGroup.animate({transform:tf,duration:1000});
 
 		transformed = true;
 	}
diff --git a/KitchenSink/Resources/examples/tabbedbar.js b/KitchenSink/Resources/examples/tabbedbar.js
index d762daf..378ff5a 100644
--- a/KitchenSink/Resources/examples/tabbedbar.js
+++ b/KitchenSink/Resources/examples/tabbedbar.js
@@ -25,14 +25,6 @@ var b = Titanium.UI.createButton({
 });
 
 win.add(b);
-b.addEventListener('click', function()
-{
-	tb1.index = 0;
-	tb2.index = 0;
-	tb3.index = 0;
-	tb4.index = 0;
-	
-});
 
 //
 // BASIC TABBED BAR
@@ -119,38 +111,46 @@ tb4.addEventListener('click', function(e)
 	l.text = 'You clicked index = ' + e.index;
 });
 
+b.addEventListener('click', function()
+{
+	tb1.index = 0;
+	tb2.index = 0;
+	tb3.index = 0;
+	tb4.index = 0;
+});
+
 //
 // CUSTOM TABBED BAR
 // 
 var buttonObjects = [
 	{title:'Toggle Style', width:110, enabled:false},
 	{image:'../images/slider_thumb.png', width:50},
-	{title:'Toggle Enabled', width:140},	
+	{title:'Toggle Enabled', width:140}
 ];
-var tb4 = Titanium.UI.createTabbedBar({
+var tb5 = Titanium.UI.createTabbedBar({
 	labels:buttonObjects,
 	backgroundColor:'#999',
 	top:100,
 	style:Titanium.UI.iPhone.SystemButtonStyle.BAR,
 	height:40,
-	index:1,
+	index:1
 });
 
-win.add(tb4);
+win.add(tb5);
 var plain = false;
-tb4.addEventListener('click', function(e)
+tb5.addEventListener('click', function(e)
 {
 	// toggle button bar style
 	if (e.index == 1)
 	{
 		if (plain)
 		{
-			tb4.style = Titanium.UI.iPhone.SystemButtonStyle.BAR;
+			tb5.style = Titanium.UI.iPhone.SystemButtonStyle.BAR;
 			plain=false;
 		}
 		else
 		{
-			tb4.style = Titanium.UI.iPhone.SystemButtonStyle.PLAIN;
+			tb5.style = Titanium.UI.iPhone.SystemButtonStyle.PLAIN;
 			plain=true;
 		}
 	}
@@ -158,8 +158,8 @@ tb4.addEventListener('click', function(e)
 	// toggle enabled
 	else if (e.index == 2)
 	{
-		buttonObjects[0].enabled = (buttonObjects[0].enabled==false)?true:false;
-		tb4.labels = buttonObjects;		
+		buttonObjects[0].enabled = (!buttonObjects[0].enabled);
+		tb5.labels = buttonObjects;
 	}
 	l.text = 'You clicked index = ' + e.index;
 });
diff --git a/KitchenSink/Resources/examples/table_view_api_controls.js b/KitchenSink/Resources/examples/table_view_api_controls.js
index 5577352..ad7b82c 100644
--- a/KitchenSink/Resources/examples/table_view_api_controls.js
+++ b/KitchenSink/Resources/examples/table_view_api_controls.js
@@ -4,8 +4,8 @@ var ts1 = new Date().getTime();
 
 function rightButtonClickHandler(e)
 {
-	Ti.API.info("button click on row. index = "+e.index+", row = "+e.source.row+", section = "+e.source.section+",rightButton = "+rightButton);
-};
+	Ti.API.info("button click on row. index = "+e.index+", row = "+e.source.row+", section = "+e.source.section+",rightButton = "+e.source);
+}
 
 function rowClickHandler(e)
 {
@@ -15,7 +15,7 @@ function rowClickHandler(e)
 function sectionClickHandler(e)
 {
 	Ti.API.info("row click on section. index = "+e.index+", row = "+e.row+", section = "+e.section+", source="+e.source);
-};
+}
 
 
 for (var c=0;c<10;c++)
@@ -51,7 +51,7 @@ var tableview = Titanium.UI.createTableView({
 	data:data,
 	style: Titanium.UI.iPhone.TableViewStyle.GROUPED,
 	//rowHeight:80,
-	minRowHeight:80,
+	minRowHeight:80
 	//maxRowHeight:500,
 });
 
@@ -87,7 +87,7 @@ var messageWin = Titanium.UI.createWindow({
 	Titanium.UI.PORTRAIT,
 	Titanium.UI.UPSIDE_PORTRAIT,
 	Titanium.UI.LANDSCAPE_LEFT,
-	Titanium.UI.LANDSCAPE_RIGHT,
+	Titanium.UI.LANDSCAPE_RIGHT
 	]
 });
 
diff --git a/KitchenSink/Resources/examples/table_view_api_search.js b/KitchenSink/Resources/examples/table_view_api_search.js
index c88068c..501894f 100644
--- a/KitchenSink/Resources/examples/table_view_api_search.js
+++ b/KitchenSink/Resources/examples/table_view_api_search.js
@@ -15,7 +15,7 @@ var search = Titanium.UI.createSearchBar({
 });
 search.addEventListener('change', function(e)
 {
-   e.value // search string as user types
+//   e.value; // search string as user types
 });
 search.addEventListener('return', function(e)
 {
diff --git a/KitchenSink/Resources/examples/table_view_composite.js b/KitchenSink/Resources/examples/table_view_composite.js
index bc9be8e..42e17b3 100644
--- a/KitchenSink/Resources/examples/table_view_composite.js
+++ b/KitchenSink/Resources/examples/table_view_composite.js
@@ -32,7 +32,7 @@ tableview.addEventListener('click', function(e)
 	row.hasCheck = true;
 	var color = '#' + String(Math.round(Math.random()*9)) + String(Math.round(Math.random()*9)) + String(Math.round(Math.random()*9));
 	row.title = "Color is now: "+color;
-	row.backgroundColor = color
+	row.backgroundColor = color;
 	//Titanium.UI.createAlertDialog({title:'Table View',message:'row ' + row + ' index ' + index + ' section ' + section  + ' row data ' + rowdata}).show();
 });
 
diff --git a/KitchenSink/Resources/examples/table_view_controls_2.js b/KitchenSink/Resources/examples/table_view_controls_2.js
index c6981f5..d806f0e 100644
--- a/KitchenSink/Resources/examples/table_view_controls_2.js
+++ b/KitchenSink/Resources/examples/table_view_controls_2.js
@@ -20,7 +20,7 @@ function addRow()
 	
 	sw.addEventListener('change', function(e)
 	{
-		Ti.API.info('parent for switch ' + e.source.parent)
+		Ti.API.info('parent for switch ' + e.source.parent);
 		clickLabel.text = 'Switch changed to ' + e.value + ' at ' + new Date();
 	});
 	
@@ -43,18 +43,24 @@ function addRow()
 var data = [];
 
 var row = Ti.UI.createTableViewRow({height:50});
+
+var tableView = Ti.UI.createTableView({
+	data:data,
+	style: Titanium.UI.iPhone.TableViewStyle.GROUPED,
+	top:50
+});
+
 var l = Ti.UI.createLabel({
 	text:'Append Row',
 	color:'#999',
-	textAlign:'center',
-
+	textAlign:'center'
 });
 row.add(l);
-row.className = 'header'
+row.className = 'header';
 row.addEventListener('click', function()
 {
 	tableView.appendRow(addRow());
-})
+});
 data[0] = row;
 
 for (var x=1;x<3;x++)
@@ -62,13 +68,8 @@ for (var x=1;x<3;x++)
 	data[x] = addRow();
 }
 
-var tableView = Ti.UI.createTableView({
-	data:data, 	
-	style: Titanium.UI.iPhone.TableViewStyle.GROUPED,
-	top:50
-});
 tableView.addEventListener('click', function(e)
 {
 	clickLabel.text = 'row clicked at ' + new Date()+', source='+e.source;
 });
-win.add(tableView);	
\ No newline at end of file
+win.add(tableView);
\ No newline at end of file
diff --git a/KitchenSink/Resources/examples/table_view_delete.js b/KitchenSink/Resources/examples/table_view_delete.js
index d921982..220db26 100644
--- a/KitchenSink/Resources/examples/table_view_delete.js
+++ b/KitchenSink/Resources/examples/table_view_delete.js
@@ -1,6 +1,6 @@
 var win = Titanium.UI.currentWindow;
 
-var data = []
+var data = [];
 // create the rest of the rows
 for (var c=0;c<50;c++)
 {
@@ -55,16 +55,17 @@ var edit = Titanium.UI.createButton({
 	title:'Edit'
 });
 
+var cancel = Titanium.UI.createButton({
+	title:'Cancel',
+	style:Titanium.UI.iPhone.SystemButtonStyle.DONE
+});
+
 edit.addEventListener('click', function()
 {
 	win.setRightNavButton(cancel);
 	tableView.editing = true;
 });
 
-var cancel = Titanium.UI.createButton({
-	title:'Cancel',
-	style:Titanium.UI.iPhone.SystemButtonStyle.DONE
-});
 cancel.addEventListener('click', function()
 {
 	win.setRightNavButton(edit);
diff --git a/KitchenSink/Resources/examples/table_view_delete_2.js b/KitchenSink/Resources/examples/table_view_delete_2.js
index 6453b29..0fe1354 100644
--- a/KitchenSink/Resources/examples/table_view_delete_2.js
+++ b/KitchenSink/Resources/examples/table_view_delete_2.js
@@ -46,16 +46,17 @@ var edit = Titanium.UI.createButton({
 	title:'Edit'
 });
 
+var cancel = Titanium.UI.createButton({
+	title:'Cancel',
+	style:Titanium.UI.iPhone.SystemButtonStyle.DONE
+});
+
 edit.addEventListener('click', function()
 {
 	win.setRightNavButton(cancel);
 	tableview.editing = true;
 });
 
-var cancel = Titanium.UI.createButton({
-	title:'Cancel',
-	style:Titanium.UI.iPhone.SystemButtonStyle.DONE
-});
 cancel.addEventListener('click', function()
 {
 	win.setRightNavButton(edit);
diff --git a/KitchenSink/Resources/examples/table_view_delete_3.js b/KitchenSink/Resources/examples/table_view_delete_3.js
index 4dc3198..bdc34bd 100644
--- a/KitchenSink/Resources/examples/table_view_delete_3.js
+++ b/KitchenSink/Resources/examples/table_view_delete_3.js
@@ -35,16 +35,17 @@ var edit = Titanium.UI.createButton({
 	title:'Edit'
 });
 
+var cancel = Titanium.UI.createButton({
+	title:'Cancel',
+	style:Titanium.UI.iPhone.SystemButtonStyle.DONE
+});
+
 edit.addEventListener('click', function()
 {
 	win.setRightNavButton(cancel);
 	tableview.editing = true;
 });
 
-var cancel = Titanium.UI.createButton({
-	title:'Cancel',
-	style:Titanium.UI.iPhone.SystemButtonStyle.DONE
-});
 cancel.addEventListener('click', function()
 {
 	win.setRightNavButton(edit);
diff --git a/KitchenSink/Resources/examples/table_view_dynamic_scroll.js b/KitchenSink/Resources/examples/table_view_dynamic_scroll.js
index 4e24ae1..13293f6 100644
--- a/KitchenSink/Resources/examples/table_view_dynamic_scroll.js
+++ b/KitchenSink/Resources/examples/table_view_dynamic_scroll.js
@@ -27,17 +27,6 @@ win.setRightNavButton(navActInd);
 var updating = false;
 var loadingRow = Ti.UI.createTableViewRow({title:"Loading..."});
 
-function beginUpdate()
-{
-	updating = true;
-	navActInd.show();
-
-	tableView.appendRow(loadingRow);
-	
-	// just mock out the reload
-	setTimeout(endUpdate,2000);
-}
-
 function endUpdate()
 {
 	updating = false;
@@ -52,11 +41,22 @@ function endUpdate()
 	lastRow += 10;
 	
 	// just scroll down a bit to the new rows to bring them into view
-	tableView.scrollToIndex(lastRow-9,{animated:true,position:Ti.UI.iPhone.TableViewScrollPosition.BOTTOM})
+	tableView.scrollToIndex(lastRow-9,{animated:true,position:Ti.UI.iPhone.TableViewScrollPosition.BOTTOM});
 	
 	navActInd.hide();
 }
 
+function beginUpdate()
+{
+	updating = true;
+	navActInd.show();
+
+	tableView.appendRow(loadingRow);
+
+	// just mock out the reload
+	setTimeout(endUpdate,2000);
+}
+
 var lastDistance = 0; // calculate location to determine direction
 
 tableView.addEventListener('scroll',function(e)
@@ -73,7 +73,7 @@ tableView.addEventListener('scroll',function(e)
 	if (distance < lastDistance)
 	{
 		// adjust the % of rows scrolled before we decide to start fetching
-		var nearEnd = theEnd * .75; 
+		var nearEnd = theEnd * 0.75;
 		
 		if (!updating && (total >= nearEnd))
 		{
diff --git a/KitchenSink/Resources/examples/table_view_edit_and_move.js b/KitchenSink/Resources/examples/table_view_edit_and_move.js
index 58b01ce..351e026 100644
--- a/KitchenSink/Resources/examples/table_view_edit_and_move.js
+++ b/KitchenSink/Resources/examples/table_view_edit_and_move.js
@@ -13,7 +13,7 @@ var data = [
 
 // create table view
 var tableview = Titanium.UI.createTableView({
-	data:data, editable:true, moveable:true,
+	data:data, editable:true, moveable:true
 });
 
 
@@ -33,16 +33,17 @@ var edit = Titanium.UI.createButton({
 	title:'Edit'
 });
 
+var cancel = Titanium.UI.createButton({
+	title:'Cancel',
+	style:Titanium.UI.iPhone.SystemButtonStyle.DONE
+});
+
 edit.addEventListener('click', function()
 {
 	win.setRightNavButton(cancel);
 	tableview.editing = true;
 });
 
-var cancel = Titanium.UI.createButton({
-	title:'Cancel',
-	style:Titanium.UI.iPhone.SystemButtonStyle.DONE
-});
 cancel.addEventListener('click', function()
 {
 	win.setRightNavButton(edit);
diff --git a/KitchenSink/Resources/examples/table_view_empty.js b/KitchenSink/Resources/examples/table_view_empty.js
index 573bea1..87f1e60 100644
--- a/KitchenSink/Resources/examples/table_view_empty.js
+++ b/KitchenSink/Resources/examples/table_view_empty.js
@@ -12,7 +12,7 @@ var b1 = Ti.UI.createButton({
 win.add(b1);
 b1.addEventListener('click',function()
 {
-	tableView.appendRow({title:'Foo'},{animationStyle:Titanium.UI.iPhone.RowAnimationStyle.LEFT} )
+	tableView.appendRow({title:'Foo'},{animationStyle:Titanium.UI.iPhone.RowAnimationStyle.LEFT});
 
 	//NOTE: since we're appending 2 different row layouts, we need to give one of them
 	//a table className otherwise the tableview will assume they're the same layout and
diff --git a/KitchenSink/Resources/examples/table_view_events.js b/KitchenSink/Resources/examples/table_view_events.js
index 41951aa..c33534c 100644
--- a/KitchenSink/Resources/examples/table_view_events.js
+++ b/KitchenSink/Resources/examples/table_view_events.js
@@ -71,16 +71,33 @@ tableView.addEventListener('dblckick', function(e)
 });
 win.add(tableView);
 
+function rowClicked(e)
+{
+  rowLabel.text = 'row clicked on row ' + e.index+' at ' + new Date().getSeconds();
+}
+
+function imageClicked(e)
+{
+  imageLabel.text = 'image clicked on row ' + e.source.row+' at ' + new Date().getSeconds();
+}
+
+function labelClicked(e)
+{
+  labelLabel.text = 'label clicked on row ' + e.source.row+' at ' + new Date().getSeconds();
+}
+
+function buttonClicked(e)
+{
+  buttonLabel.text = 'button clicked on row ' + e.source.row +' at ' + new Date().getSeconds();
+}
+
 var rows = [];
 for (var i=0;i<10;i++)
 {
 	var row = Ti.UI.createTableViewRow({
 		height:'auto'
 	});
-	row.addEventListener('click', function(e)
-	{
-		rowLabel.text = 'row clicked on row ' + e.index+' at ' + new Date().getSeconds();
-	});
+	row.addEventListener('click', rowClicked);
 	
 	var imageView = Ti.UI.createImageView({
 		url:'../images/apple_logo.jpg',
@@ -88,10 +105,7 @@ for (var i=0;i<10;i++)
 		width:30
 	});
 	imageView.row = i;
-	imageView.addEventListener('click', function(e)
-	{
-		imageLabel.text = 'image clicked on row ' + e.source.row+' at ' + new Date().getSeconds();
-	});
+	imageView.addEventListener('click', imageClicked);
 	row.add(imageView);
 
 	var label = Ti.UI.createLabel({
@@ -100,10 +114,7 @@ for (var i=0;i<10;i++)
 		width:100
 	});
 	label.row = i;
-	label.addEventListener('click', function(e)
-	{
-		labelLabel.text = 'label clicked on row ' + e.source.row+' at ' + new Date().getSeconds();
-	});
+	label.addEventListener('click', labelClicked);
 	row.add(label);
 	
 	var button = Ti.UI.createButton({
@@ -112,10 +123,7 @@ for (var i=0;i<10;i++)
 		width:100
 	});
 	button.row = i;
-	button.addEventListener('click', function(e)
-	{
-		buttonLabel.text = 'button clicked on row ' + e.source.row +' at ' + new Date().getSeconds();
-	});
+	button.addEventListener('click', buttonClicked);
 	row.add(button);
 	
 	rows[i] = row;	
diff --git a/KitchenSink/Resources/examples/table_view_footers.js b/KitchenSink/Resources/examples/table_view_footers.js
index 8b419f9..5e588eb 100644
--- a/KitchenSink/Resources/examples/table_view_footers.js
+++ b/KitchenSink/Resources/examples/table_view_footers.js
@@ -4,7 +4,7 @@ var data = [
 	{title:'Alice', hasDetail:true},
 	{title:'Alexander', hasCheck:true},
 	{title:'Amos'},
-	{title:'Alonzo', footer:'footer'},
+	{title:'Alonzo', footer:'footer'}
 ];
 
 // create table view
diff --git a/KitchenSink/Resources/examples/table_view_headers_filter.js b/KitchenSink/Resources/examples/table_view_headers_filter.js
index 9f73885..8ddc19a 100644
--- a/KitchenSink/Resources/examples/table_view_headers_filter.js
+++ b/KitchenSink/Resources/examples/table_view_headers_filter.js
@@ -70,18 +70,6 @@ var tableview = Titanium.UI.createTableView({
 	search:search
 });
 
-// create table view event listener
-tableview.addEventListener('click', function(e)
-{
-	if (e.index == 0)
-	tableview.index = index2
-	// event data
-	var index = e.index;
-	var section = e.section;
-	var row = e.row;
-	var rowdata = e.rowData;
-	Titanium.UI.createAlertDialog({title:'Table View',message:'row ' + row + ' index ' + index + ' section ' + section  + ' row data ' + rowdata}).show();
-});
 // set filters
 var index = [
 	{title:'A',index:0},
@@ -119,7 +107,22 @@ var index2 = [
 {title:'NN',index:52},
 {title:'OO',index:55},
 {title:'PP',index:(data.length -1)}	
-
 ];
+
+// create table view event listener
+tableview.addEventListener('click', function(e)
+{
+	if (e.index == 0)
+	{
+  		tableview.index = index2;
+	}
+	// event data
+	var index = e.index;
+	var section = e.section;
+	var row = e.row;
+	var rowdata = e.rowData;
+	Titanium.UI.createAlertDialog({title:'Table View',message:'row ' + row + ' index ' + index + ' section ' + section  + ' row data ' + rowdata}).show();
+});
+
 // add table view to the window
 Titanium.UI.currentWindow.add(tableview);
diff --git a/KitchenSink/Resources/examples/table_view_layout_2.js b/KitchenSink/Resources/examples/table_view_layout_2.js
index 7748914..1b398c3 100644
--- a/KitchenSink/Resources/examples/table_view_layout_2.js
+++ b/KitchenSink/Resources/examples/table_view_layout_2.js
@@ -10,7 +10,7 @@ var search = Titanium.UI.createSearchBar({
 });
 search.addEventListener('change', function(e)
 {
-   e.value // search string as user types
+   //e.value; // search string as user types
 });
 search.addEventListener('return', function(e)
 {
@@ -25,10 +25,10 @@ var tableView;
 var data = [];
 
 // create first row
-var row = Ti.UI.createTableViewRow();
-row.backgroundColor = '#576996';
-row.selectedBackgroundColor = '#385292';
-row.height = 40;
+var row1 = Ti.UI.createTableViewRow();
+row1.backgroundColor = '#576996';
+row1.selectedBackgroundColor = '#385292';
+row1.height = 40;
 var clickLabel = Titanium.UI.createLabel({
 	text:'Click different parts of the row',
 	color:'#fff',
@@ -37,14 +37,14 @@ var clickLabel = Titanium.UI.createLabel({
 	width:'auto',
 	height:'auto'
 });
-row.className = 'header';
-row.add(clickLabel);
-data.push(row);
+row1.className = 'header';
+row1.add(clickLabel);
+data.push(row1);
 
 // when you click the header, scroll to the bottom
-row.addEventListener('click',function()
+row1.addEventListener('click',function()
 {
-	tableView.scrollToIndex(40,{animated:true,position:Ti.UI.iPhone.TableViewScrollPosition.TOP})
+	tableView.scrollToIndex(40,{animated:true,position:Ti.UI.iPhone.TableViewScrollPosition.TOP});
 });
 
 // create update row (used when the user clicks on the row)
@@ -86,7 +86,7 @@ for (var c=1;c<50;c++)
 		left:10,
 		width:50,
 		height:50,
-		clickName:'photo',
+		clickName:'photo'
 	});
 	row.add(photo);
 	
@@ -174,7 +174,7 @@ tableView.addEventListener('click', function(e)
 	var rowNum = e.index;
 	var updateRow = createUpdateRow('You clicked on the '+e.source.clickName);
 	tableView.updateRow(rowNum,updateRow,{animationStyle:Titanium.UI.iPhone.RowAnimationStyle.LEFT});	
-})
+});
 
 win.add(tableView);
 
diff --git a/KitchenSink/Resources/examples/table_view_layout_3.js b/KitchenSink/Resources/examples/table_view_layout_3.js
index be3c62d..5e2908d 100644
--- a/KitchenSink/Resources/examples/table_view_layout_3.js
+++ b/KitchenSink/Resources/examples/table_view_layout_3.js
@@ -40,6 +40,15 @@ var add1 = Ti.UI.createButton({
 	top:15,
 	right:10
 });
+var delete1 = Ti.UI.createButton({
+	backgroundImage:'../images/groupedview/minusDefault.png',
+	height:27,
+	width:27,
+	top:15,
+	left:10,
+	visible:false
+});
+
 add1.addEventListener('click', function()
 {
 	row1.backgroundColor = '#390A0E';
@@ -54,14 +63,6 @@ add1.addEventListener('click', function()
 });
 row1.add(add1);
 
-var delete1 = Ti.UI.createButton({
-	backgroundImage:'../images/groupedview/minusDefault.png',
-	height:27,
-	width:27,
-	top:15,
-	left:10,
-	visible:false
-});
 delete1.addEventListener('click', function()
 {
 	row1.backgroundColor = '#670000';
@@ -99,7 +100,7 @@ var cost2 = Ti.UI.createLabel({
 	left:10,
 	height:25,
 	width:150
-})	
+});
 row2.add(cost2);
 
 var add2 = Ti.UI.createButton({
@@ -109,6 +110,16 @@ var add2 = Ti.UI.createButton({
 	top:15,
 	right:10
 });
+
+var delete2 = Ti.UI.createButton({
+	backgroundImage:'../images/groupedview/minusDefault.png',
+	height:27,
+	width:27,
+	top:15,
+	left:10,
+	visible:false
+});
+
 add2.addEventListener('click', function()
 {
 	row2.backgroundColor = '#390A0E';
@@ -125,14 +136,6 @@ add2.addEventListener('click', function()
 });
 row2.add(add2);
 
-var delete2 = Ti.UI.createButton({
-	backgroundImage:'../images/groupedview/minusDefault.png',
-	height:27,
-	width:27,
-	top:15,
-	left:10,
-	visible:false
-});
 delete2.addEventListener('click', function()
 {
 	row2.backgroundColor = '#670000';	
diff --git a/KitchenSink/Resources/examples/table_view_layout_4.js b/KitchenSink/Resources/examples/table_view_layout_4.js
index ee5d9ef..30c223d 100644
--- a/KitchenSink/Resources/examples/table_view_layout_4.js
+++ b/KitchenSink/Resources/examples/table_view_layout_4.js
@@ -42,6 +42,11 @@ var footerView = Ti.UI.createView({
 headerView.add(headerLabel);
 footerView.add(footerLabel);
 
+function labelClicked(e)
+{
+  Ti.API.info("clicked on label "+e.source);
+}
+
 for (var c=0;c<30;c++)
 {
 	var row = Ti.UI.createTableViewRow();
@@ -90,10 +95,7 @@ for (var c=0;c<30;c++)
 	}
 	row.add(label);
 	
-	label.addEventListener('click',function(e)
-	{
-		Ti.API.info("clicked on label "+e.source);
-	});
+	label.addEventListener('click', labelClicked);
 
 	var label2 = Ti.UI.createLabel({
 		text: "Other information could go here if you'd like",
diff --git a/KitchenSink/Resources/examples/table_view_layout_5.js b/KitchenSink/Resources/examples/table_view_layout_5.js
index e752125..d43b188 100644
--- a/KitchenSink/Resources/examples/table_view_layout_5.js
+++ b/KitchenSink/Resources/examples/table_view_layout_5.js
@@ -17,7 +17,7 @@ w.add(table);
 
 var idx = 1;
 
-for (var i in images) {
+for (var i = 0; i < images.length; i++) {
     var row = Ti.UI.createTableViewRow({
         height: 150,
         className: 'image'
diff --git a/KitchenSink/Resources/examples/table_view_move.js b/KitchenSink/Resources/examples/table_view_move.js
index 467d1fc..f7dceac 100644
--- a/KitchenSink/Resources/examples/table_view_move.js
+++ b/KitchenSink/Resources/examples/table_view_move.js
@@ -44,12 +44,6 @@ var edit = Titanium.UI.createButton({
 	title:'Move'
 });
 
-edit.addEventListener('click', function()
-{
-	win.setRightNavButton(cancel);
-	tableview.moving = true;
-});
-
 var cancel = Titanium.UI.createButton({
 	title:'Cancel',
 	style:Titanium.UI.iPhone.SystemButtonStyle.DONE
@@ -60,4 +54,10 @@ cancel.addEventListener('click', function()
 	tableview.moving = false;
 });
 
+edit.addEventListener('click', function()
+{
+	win.setRightNavButton(cancel);
+	tableview.moving = true;
+});
+
 win.setRightNavButton(edit);
\ No newline at end of file
diff --git a/KitchenSink/Resources/examples/table_view_perf.js b/KitchenSink/Resources/examples/table_view_perf.js
index 3df2e07..0fc46a9 100644
--- a/KitchenSink/Resources/examples/table_view_perf.js
+++ b/KitchenSink/Resources/examples/table_view_perf.js
@@ -17,7 +17,7 @@ v.add(l);
 w.add(v);
 
 var count = 500;
-var ts = new Date;
+var ts = new Date();
 
 var data = [];
 
@@ -29,7 +29,7 @@ for (var c=0;c<count;c++)
 
 tv.data = data;
 
-var ts2 = new Date;
+var ts2 = new Date();
 var duration = ts2.getTime() - ts.getTime();
 var each = count / duration;
 l.text = "Executed: "+count+" iterations\nTook: " + duration +" ms\n" + each.toFixed(2) + " ms/row";
diff --git a/KitchenSink/Resources/examples/table_view_pull_to_refresh.js b/KitchenSink/Resources/examples/table_view_pull_to_refresh.js
index bf45588..ea5de67 100644
--- a/KitchenSink/Resources/examples/table_view_pull_to_refresh.js
+++ b/KitchenSink/Resources/examples/table_view_pull_to_refresh.js
@@ -2,7 +2,7 @@ var win = Ti.UI.currentWindow;
 
 function formatDate()
 {
-	var date = new Date;
+	var date = new Date();
 	var datestr = date.getMonth()+'/'+date.getDate()+'/'+date.getFullYear();
 	if (date.getHours()>=12)
 	{
@@ -33,7 +33,7 @@ var border = Ti.UI.createView({
 	backgroundColor:"#576c89",
 	height:2,
 	bottom:0
-})
+});
 
 var tableHeader = Ti.UI.createView({
 	backgroundColor:"#e2e7ed",
@@ -97,12 +97,6 @@ tableView.headerPullView = tableHeader;
 var pulling = false;
 var reloading = false;
 
-function beginReloading()
-{
-	// just mock out the reload
-	setTimeout(endReloading,2000);
-}
-
 function endReloading()
 {
 	// simulate loading 
@@ -121,15 +115,21 @@ function endReloading()
 	arrow.show();
 }
 
+function beginReloading()
+{
+	// just mock out the reload
+	setTimeout(endReloading,2000);
+}
+
 tableView.addEventListener('scroll',function(e)
 {
 	var offset = e.contentOffset.y;
 	if (offset <= -65.0 && !pulling)
 	{
-		var t = Ti.UI.create2DMatrix();
-		t = t.rotate(-180);
+		var tf = Ti.UI.create2DMatrix();
+		tf = tf.rotate(-180);
 		pulling = true;
-		arrow.animate({transform:t,duration:180});
+		arrow.animate({transform:tf,duration:180});
 		statusLabel.text = "Release to refresh...";
 	}
 	else if (pulling && offset > -65.0 && offset < 0)
diff --git a/KitchenSink/Resources/examples/table_view_refresh.js b/KitchenSink/Resources/examples/table_view_refresh.js
index f91a08a..5c1df91 100644
--- a/KitchenSink/Resources/examples/table_view_refresh.js
+++ b/KitchenSink/Resources/examples/table_view_refresh.js
@@ -1,7 +1,7 @@
 var win = Ti.UI.currentWindow;
 
 var tv = Ti.UI.createTableView({
-	style:Titanium.UI.iPhone.TableViewStyle.GROUPED,
+	style:Titanium.UI.iPhone.TableViewStyle.GROUPED
 });
 
 function setData()
@@ -14,13 +14,13 @@ function setData()
 		row.add(l1);
 		var image1 = Ti.UI.createImageView({url:'../images/chat.png', right:5,height:23, width:29});
 		row.add(image1);
-		data.push(row)
+		data.push(row);
 	}
 	tv.setData(data);
 }
 
 var refresh = Titanium.UI.createButton({
-	systemButton:Titanium.UI.iPhone.SystemButton.REFRESH,
+	systemButton:Titanium.UI.iPhone.SystemButton.REFRESH
 });
 refresh.addEventListener('click', function()
 {
@@ -28,7 +28,7 @@ refresh.addEventListener('click', function()
 	setTimeout(function()
 	{
 		setData();
-	},1000)
+	},1000);
 });
 
 if (Ti.Platform.name == 'iPhone OS') {
diff --git a/KitchenSink/Resources/examples/table_view_row_append.js b/KitchenSink/Resources/examples/table_view_row_append.js
index a29cc66..88820af 100644
--- a/KitchenSink/Resources/examples/table_view_row_append.js
+++ b/KitchenSink/Resources/examples/table_view_row_append.js
@@ -19,7 +19,7 @@ var newSectionCount = 1;
 // create table view event listener
 tableview.addEventListener('click', function(e)
 {
-	Ti.API.info('clicked received for row ' + e.index)
+	Ti.API.info('clicked received for row ' + e.index);
 	// event data
 	var index = e.index;
 	var section = e.section;
@@ -35,22 +35,22 @@ tableview.addEventListener('click', function(e)
 		//     width:200
 		// });
 		// row.add(l);
-		var data = {title:'New Row ' + newRowCount, header:'New Header '+newSectionCount};
+		var newData = {title:'New Row ' + newRowCount, header:'New Header '+newSectionCount};
 
-		tableview.appendRow(data)
+		tableview.appendRow(newData);
 		newSectionCount++;
 		newRowCount++;
 	}
 	else if (index == 3)
 	{
-		var data = {title:'New Row ' + newRowCount};
+		var newData3 = {title:'New Row ' + newRowCount};
 		if (newRowCount == 1)
 		{
-			tableview.appendRow(data);
+			tableview.appendRow(newData3);
 		}
 		else
 		{
-			tableview.appendRow(data,{animationStyle:Titanium.UI.iPhone.RowAnimationStyle.LEFT});
+			tableview.appendRow(newData3,{animationStyle:Titanium.UI.iPhone.RowAnimationStyle.LEFT});
 		}
 		newRowCount++;				
 	}
diff --git a/KitchenSink/Resources/examples/table_view_row_insert.js b/KitchenSink/Resources/examples/table_view_row_insert.js
index 65b6347..e05759b 100644
--- a/KitchenSink/Resources/examples/table_view_row_insert.js
+++ b/KitchenSink/Resources/examples/table_view_row_insert.js
@@ -31,39 +31,31 @@ tableView.addEventListener('click', function(e)
 	switch(e.rowData.title)
 	{
 		case 'Insert Row Above (no anim)':
-		{
-			var row = Ti.UI.createTableViewRow();
+			var rowAbove = Ti.UI.createTableViewRow();
 			var label = Ti.UI.createLabel({text:'New Row Object Row'});
-			row.add(label)
-			tableView.insertRowBefore(0,row);				
+			rowAbove.add(label);
+			tableView.insertRowBefore(0,rowAbove);
 			break;
-		}
+
 		case 'Insert Row Below - 1':
-		{
-			var row = tableView.getIndexByName('3');
+			var rowBelow = tableView.getIndexByName('3');
 			data = {title:'New Row After Row3'};
-			tableView.insertRowAfter(row,data,{animationStyle:Titanium.UI.iPhone.RowAnimationStyle.DOWN});
+			tableView.insertRowAfter(rowBelow,data,{animationStyle:Titanium.UI.iPhone.RowAnimationStyle.DOWN});
 			break;
-		}
+
 		case 'Insert Row Below - 2':
-		{
-			var row = tableView.getIndexByName('7');
+			var row2 = tableView.getIndexByName('7');
 			data = {title:'New Row After Row7'};
-			tableView.insertRowAfter(row,data,{animationStyle:Titanium.UI.iPhone.RowAnimationStyle.DOWN});
-
+			tableView.insertRowAfter(row2,data,{animationStyle:Titanium.UI.iPhone.RowAnimationStyle.DOWN});
 			break;
-		}
 		
 		case 'Insert Row w/o animation (below)':
-		{
-			var row = tableView.getIndexByName('3');
+			var rowNA = tableView.getIndexByName('3');
 			data = {title:'New Row After Row3 w/o animation'};
-			tableView.insertRowAfter(row,data);
+			tableView.insertRowAfter(rowNA,data);
 			tableView.scrollToIndex(3,{position:Titanium.UI.iPhone.TableViewScrollPosition.MIDDLE,animated:false});
 			break;
-		}
 	}
-	
 });
 
 win.add(tableView);
diff --git a/KitchenSink/Resources/examples/table_view_row_update.js b/KitchenSink/Resources/examples/table_view_row_update.js
index 49c0dcb..8df320c 100644
--- a/KitchenSink/Resources/examples/table_view_row_update.js
+++ b/KitchenSink/Resources/examples/table_view_row_update.js
@@ -27,42 +27,31 @@ tableView.addEventListener('click',function(e)
 	switch(e.index)
 	{
 		case 0:
-		{
 			var data = {title:'New Row 1 Title', header:'New Section Header'};
 			tableView.updateRow(0,data);				
 			break;
-		}
+
 		case 1:
-		{
 			var row = tableView.getIndexByName('row2');
 			data = {title:'New Row2',name:'row2'};
 			tableView.updateRow(row,data,{animationStyle:Titanium.UI.iPhone.RowAnimationStyle.RIGHT});
-
 			break;
-		}
+
 		case 2:
-		{
 			data = {title:'New Row3'};
 			tableView.updateRow(2,data,{animationStyle:Titanium.UI.iPhone.RowAnimationStyle.LEFT});
 			break;
-		}
+
 		case 3:
-		{
 			data = {title:'New Row4'};
 			tableView.updateRow(3,data,{animationStyle:Titanium.UI.iPhone.RowAnimationStyle.DOWN});
 			break;
-		}
 
 		case 4:
-		{
 			data = {title:'I am a title'};
 			tableView.updateRow(4,data,{animationStyle:Titanium.UI.iPhone.RowAnimationStyle.DOWN});
 			break;
-		}
-		
 	}
-
-	
 });
 
 win.add(tableView);
\ No newline at end of file
diff --git a/KitchenSink/Resources/examples/table_view_section_header.js b/KitchenSink/Resources/examples/table_view_section_header.js
index aebe190..3333147 100644
--- a/KitchenSink/Resources/examples/table_view_section_header.js
+++ b/KitchenSink/Resources/examples/table_view_section_header.js
@@ -2,7 +2,7 @@
 //  This is a test that is meant to verify that a row object can have a header 
 //  and the table view has no table view header - the header should be displayed
 
-var win = Titanium.UI.currentWindow
+var win = Titanium.UI.currentWindow;
 
 var inputData = [
 	{title:'row 1', header:'Header 1'},
diff --git a/KitchenSink/Resources/examples/table_view_set.js b/KitchenSink/Resources/examples/table_view_set.js
index fae6941..f499a14 100644
--- a/KitchenSink/Resources/examples/table_view_set.js
+++ b/KitchenSink/Resources/examples/table_view_set.js
@@ -30,39 +30,35 @@ tableView.addEventListener('click',function(e)
 	switch(e.index)
 	{
 		case 0:
-		{
-			var data = [];
+			var data0 = [];
 			for (var c=0;c<10;c++)
 			{
 				var row = Ti.UI.createTableViewRow();
 				row.title = "Row "+ (c+1);
 				row.hasCheck = true;
 				row.backgroundColor = '#aaa';
-				data[c]=row;
+				data0[c]=row;
 			}
 			tableView.separatorStyle = Ti.UI.iPhone.TableViewSeparatorStyle.NONE;
-			tableView.setData(data,{animationStyle:Titanium.UI.iPhone.RowAnimationStyle.NONE});				
+			tableView.setData(data0,{animationStyle:Titanium.UI.iPhone.RowAnimationStyle.NONE});
 			break;
-		}
+
 		case 1:
-		{
-			var data = [
+			var data1 = [
 				{title:'Set TableView 1',hasDetail:true, image:'Phone.png'},
 				{title:'Set TableView 2', hasChild:true, image:'Safari.png'},
 				{title:'Set TableView 3', image:'iTunes.png'},
 				{title:'Row 4', image:'Mail.png'},
 				{title:'Row 5', image:'Mail.png'},
 				{title:'Row 7', image:'Mail.png'}
-
 			];
 			tableView.separatorStyle = Ti.UI.iPhone.TableViewSeparatorStyle.SINGLE_LINE;
 			tableView.separatorColor = null;
-			tableView.setData(data,{animationStyle:Titanium.UI.iPhone.RowAnimationStyle.DOWN});
+			tableView.setData(data1,{animationStyle:Titanium.UI.iPhone.RowAnimationStyle.DOWN});
 			break;
-		}
+
 		case 2:
-		{
-			var data = [
+			var data2 = [
 				{title:'Set TableView 1'},
 				{title:'Set TableView 2'},
 				{title:'Set TableView 3'},
@@ -72,16 +68,12 @@ tableView.addEventListener('click',function(e)
 				{title:'Row 7'},
 				{title:'Row 8'},
 				{title:'Row 9'}
-
 			];
 			tableView.separatorStyle = Ti.UI.iPhone.TableViewSeparatorStyle.SINGLE_LINE;
 			tableView.separatorColor = "red";
-			tableView.setData(data,{animationStyle:Titanium.UI.iPhone.RowAnimationStyle.UP});
+			tableView.setData(data2,{animationStyle:Titanium.UI.iPhone.RowAnimationStyle.UP});
 			break;
-		}
-		
 	}
-		
 });
 
 win.add(tableView);
\ No newline at end of file
diff --git a/KitchenSink/Resources/examples/table_view_textfield.js b/KitchenSink/Resources/examples/table_view_textfield.js
index 79f85bd..e4641dd 100644
--- a/KitchenSink/Resources/examples/table_view_textfield.js
+++ b/KitchenSink/Resources/examples/table_view_textfield.js
@@ -8,7 +8,7 @@ function addRow(addTextArea)
 	{
 		tf1 = Titanium.UI.createTextArea({
 			color:'#336699',
-			width:250,
+			width:250
 		});	
 		
 	}
@@ -37,10 +37,13 @@ var data = [];
 for (var x=0;x<10;x++)
 {
 	if (x==9)
+	{
 		data[x] = addRow(true);
+	}
 	else
+	{
 		data[x] = addRow();
-	
+	}
 }
 
 var tableView = Ti.UI.createTableView({
@@ -49,6 +52,6 @@ var tableView = Ti.UI.createTableView({
 });
 win.addEventListener('focus', function()
 {
-	Ti.API.info('window focus fired')
-})
+	Ti.API.info('window focus fired');
+});
 win.add(tableView);
\ No newline at end of file
diff --git a/KitchenSink/Resources/examples/table_view_touch.js b/KitchenSink/Resources/examples/table_view_touch.js
index ac3a9d5..b48a3a1 100644
--- a/KitchenSink/Resources/examples/table_view_touch.js
+++ b/KitchenSink/Resources/examples/table_view_touch.js
@@ -19,7 +19,7 @@ for (var x=0;x<4;x++)
 
 // create table view
 var tableview = Titanium.UI.createTableView({
-	data:data,
+	data:data
 });
 
 tableview.addEventListener('touchstart', function(e)
diff --git a/KitchenSink/Resources/examples/table_views.js b/KitchenSink/Resources/examples/table_views.js
index 33a7a9c..5dc9697 100644
--- a/KitchenSink/Resources/examples/table_views.js
+++ b/KitchenSink/Resources/examples/table_views.js
@@ -29,7 +29,7 @@ var data = [
 	{title:'Refresh Table View', hasChild:true, test:'../examples/table_view_refresh.js'},
 	{title:'Composite (Partial Size)', hasChild:true, test:'../examples/table_view_composite.js'},
 	{title:'Table View (Layout)', hasChild:true, test:'../examples/table_view_layout.js'},
-	{title:'Table View (Layout 2)', hasChild:true, test:'../examples/table_view_layout_2.js'},
+	{title:'Table View (Layout 2)', hasChild:true, test:'../examples/table_view_layout_2.js'}
 ];
 
 // add iphone specific tests
diff --git a/KitchenSink/Resources/examples/textfield_therest.js b/KitchenSink/Resources/examples/textfield_therest.js
index 484d228..c677279 100644
--- a/KitchenSink/Resources/examples/textfield_therest.js
+++ b/KitchenSink/Resources/examples/textfield_therest.js
@@ -123,33 +123,28 @@ b6.addEventListener('click', function()
 	switch (auto)
 	{
 		case 0:
-		{
 			tf1.autocapitalization = Titanium.UI.TEXT_AUTOCAPITALIZATION_NONE;
 			b6.title = 'Capital (none)';
 			auto++;
 			break;
-		}
+
 		case 1:
-		{
 			tf1.autocapitalization = Titanium.UI.TEXT_AUTOCAPITALIZATION_WORDS;
 			b6.title = 'Capital (words)';
 			auto++;
 			break;
-		}
+
 		case 2:
-		{
 			tf1.autocapitalization = Titanium.UI.TEXT_AUTOCAPITALIZATION_SENTENCES;
 			b6.title = 'Capital (sent.)';
 			auto++;
 			break;
-		}
+
 		case 3:
-		{
 			tf1.autocapitalization = Titanium.UI.TEXT_AUTOCAPITALIZATION_ALL;
 			b6.title = 'Capital (all)';
-			auto=0
+			auto=0;
 			break;
-		}
 	}
 });
 win.add(b6);
@@ -164,39 +159,34 @@ var b7 = Titanium.UI.createButton({
 var clear =0;
 b7.addEventListener('click', function()
 {
-	Ti.API.info('clearButtonMode ' + tf1.clearButtonMode)
+	Ti.API.info('clearButtonMode ' + tf1.clearButtonMode);
 	
 	switch (clear)
 	{
 		case 0:
-		{
 			tf1.clearButtonMode = Titanium.UI.INPUT_BUTTONMODE_ALWAYS;
 			b7.title = 'Clear Button (A)';
 			clear++;
 			break;
-		}
+
 		case 1:
-		{
 			b7.title = 'Clear Button (N)';
 			tf1.clearButtonMode = Titanium.UI.INPUT_BUTTONMODE_NEVER;
 			clear++;
 			break;
-		}
+
 		case 2:
-		{
 			b7.title = 'Clear Button (F)';
 			tf1.clearButtonMode = Titanium.UI.INPUT_BUTTONMODE_ONFOCUS;
 			clear++;
 			break;
-		}
+
 		case 3:
-		{
 			b7.title = 'Clear Button (B)';
 			tf1.clearButtonMode = Titanium.UI.INPUT_BUTTONMODE_ONBLUR;
-			clear=0
+			clear=0;
 			break;
-		}
-	}	
+	}
 });
 win.add(b7);
 
@@ -213,34 +203,30 @@ b8.addEventListener('click', function()
 	switch (align)
 	{
 		case 0:
-		{
 			tf1.textAlign = 'left';
 			tf1.value = 'text align left, marker 10 bold';
 			tf1.font = {fontSize:10,fontFamily:'Marker Felt', fontWeight:'bold'};
 			align++;
 			break;
-		}
+
 		case 1:
-		{
 			tf1.textAlign = 'center';
 			tf1.value = 'text align center, arial 12';
 			tf1.font = {fontSize:12,fontFamily:'Arial', fontWeight:'normal'};
 			align++;
 			break;
-		}
+
 		case 2:
-		{
 			tf1.textAlign = 'right';
 			tf1.value = 'text align right, hel 14';
 			tf1.font = {fontSize:14,fontFamily:'Helvetica', fontWeight:'bold'};
 			align=0;
 			break;
-		}
-	}	
+	}
 });
 win.add(b8);
 
-var b8 = Titanium.UI.createButton({
+var b9 = Titanium.UI.createButton({
 	title:'Vertical Align',
 	height:40,
 	width:145,
@@ -248,37 +234,32 @@ var b8 = Titanium.UI.createButton({
 	top:255
 });
 var vAlign =0;
-b8.addEventListener('click', function()
+b9.addEventListener('click', function()
 {
 	switch (vAlign)
 	{
 		case 0:
-		{
 			tf1.verticalAlign = 'top';
-			b8.title = 'Vertical Align (T)';
+			b9.title = 'Vertical Align (T)';
 			vAlign++;
 			break;
-		}
+
 		case 1:
-		{
 			tf1.verticalAlign = 'middle';
-			b8.title = 'Vertical Align (M)';
+			b9.title = 'Vertical Align (M)';
 			vAlign++;
 			break;
-		}
+
 		case 2:
-		{
 			tf1.verticalAlign = 'bottom';
-			b8.title = 'Vertical Align (B)';
+			b9.title = 'Vertical Align (B)';
 			vAlign=0;
 			break;
-		}
-
 	}
 });
 win.add(b8);
 
-var b9 = Titanium.UI.createButton({
+var b10 = Titanium.UI.createButton({
 	title:'Allow resizing',
 	height:40,
 	width:145,
@@ -287,7 +268,7 @@ var b9 = Titanium.UI.createButton({
 });
 
 var resizing = false;
-b9.addEventListener('click', function()
+b10.addEventListener('click', function()
 {
 	if (!resizing) {
 		tf1.minimumFontSize = 8;
@@ -298,7 +279,7 @@ b9.addEventListener('click', function()
 		resizing = false;
 	}
 });
-win.add(b9);
+win.add(b10);
 
 var l = Titanium.UI.createLabel({
 	text:'Click buttons to toggle properties',
diff --git a/KitchenSink/Resources/examples/twitter.js b/KitchenSink/Resources/examples/twitter.js
index e14d431..a186d18 100644
--- a/KitchenSink/Resources/examples/twitter.js
+++ b/KitchenSink/Resources/examples/twitter.js
@@ -9,109 +9,6 @@ var twitter_name = 'appcelerator';
 var win = Ti.UI.currentWindow;
 win.title = '@'+twitter_name;
 
-
-function getTweets(screen_name){
-
-	// create table view data object
-	var data = [];
-	
-	var xhr = Ti.Network.createHTTPClient();
-	xhr.timeout = 1000000;	
-	xhr.open("GET","http://api.twitter.com/1/statuses/user_timeline.json?screen_name="+screen_name);
-
-	xhr.onload = function()
-	{
-		try
-		{
-			var tweets = eval('('+this.responseText+')');
-		
-			for (var c=0;c<tweets.length;c++){
-
-				var tweet = tweets[c].text;				
-				var user = tweets[c].user.screen_name;
-				var avatar = tweets[c].user.profile_image_url;
-				var created_at = prettyDate(strtotime(tweets[c].created_at));
-				var bgcolor = (c % 2) == 0 ? '#fff' : '#eee';
-				
-				var row = Ti.UI.createTableViewRow({hasChild:true,height:'auto',backgroundColor:bgcolor});
-
-				// Create a vertical layout view to hold all the info labels and images for each tweet
-				var post_view = Ti.UI.createView({
-					height:'auto',
-					layout:'vertical',
-					left:5,
-					top:5,
-					bottom:5,
-					right:5,
-				});
-				
-				var av = Ti.UI.createImageView({
-						image:avatar,
-						left:0,
-						top:0,
-						height:48,
-						width:48
-					});
-				// Add the avatar image to the view
-				post_view.add(av);
-
-				var user_label = Ti.UI.createLabel({
-					text:user,
-					left:54,
-					width:120,
-					top:-48,
-					bottom:2,
-					height:16,
-					textAlign:'left',
-					color:'#444444',
-					font:{fontFamily:'Trebuchet MS',fontSize:14,fontWeight:'bold'}
-				});
-				// Add the username to the view
-				post_view.add(user_label);
-				
-				var date_label = Ti.UI.createLabel({
-					text:created_at,
-					right:0,
-					top:-18,
-					bottom:2,
-					height:14,
-					textAlign:'right',
-					width:110,
-					color:'#444444',
-					font:{fontFamily:'Trebuchet MS',fontSize:12}
-				});
-				// Add the date to the view
-				post_view.add(date_label);
-			
-				var tweet_text = Ti.UI.createLabel({
-					text:tweet,
-					left:54,
-					top:0,
-					bottom:2,
-					height:'auto',
-					width:236,
-					textAlign:'left',
-					font:{fontSize:14}
-				});
-				// Add the tweet to the view
-				post_view.add(tweet_text);
-				// Add the vertical layout view to the row
-				row.add(post_view);
-				row.className = 'item'+c;
-				data[c] = row;
-			}
-			// Create the tableView and add it to the window.
-			var tableview = Titanium.UI.createTableView({data:data,minRowHeight:58});
-			Ti.UI.currentWindow.add(tableview);
-		}
-		catch(E){
-			alert(E);
-		}
-	};
-	// Get the data
-	xhr.send();	
-}
-
 function strtotime (str, now) {
 	// Emlulates the PHP strtotime function in JavaScript
  	// obtained from http://phpjs.org/functions/strtotime:554
@@ -305,5 +202,108 @@ function prettyDate(time){
 	day_diff < 7 && day_diff + " days ago" ||
 	day_diff < 31 && Math.ceil( day_diff / 7 ) + " week" + ((Math.ceil( day_diff / 7 )) == 1 ? "" : "s") + " ago";
 }
+
+function getTweets(screen_name) {
+
+	// create table view data object
+	var data = [];
+
+	var xhr = Ti.Network.createHTTPClient();
+	xhr.timeout = 1000000;
+	xhr.open("GET","http://api.twitter.com/1/statuses/user_timeline.json?screen_name="+screen_name);
+
+	xhr.onload = function()
+	{
+		try
+		{
+			var tweets = eval('('+this.responseText+')');
+
+			for (var c=0;c<tweets.length;c++){
+
+				var tweet = tweets[c].text;
+				var user = tweets[c].user.screen_name;
+				var avatar = tweets[c].user.profile_image_url;
+				var created_at = prettyDate(strtotime(tweets[c].created_at));
+				var bgcolor = (c % 2) == 0 ? '#fff' : '#eee';
+
+				var row = Ti.UI.createTableViewRow({hasChild:true,height:'auto',backgroundColor:bgcolor});
+
+				// Create a vertical layout view to hold all the info labels and images for each tweet
+				var post_view = Ti.UI.createView({
+					height:'auto',
+					layout:'vertical',
+					left:5,
+					top:5,
+					bottom:5,
+					right:5
+				});
+
+				var av = Ti.UI.createImageView({
+						image:avatar,
+						left:0,
+						top:0,
+						height:48,
+						width:48
+					});
+				// Add the avatar image to the view
+				post_view.add(av);
+
+				var user_label = Ti.UI.createLabel({
+					text:user,
+					left:54,
+					width:120,
+					top:-48,
+					bottom:2,
+					height:16,
+					textAlign:'left',
+					color:'#444444',
+					font:{fontFamily:'Trebuchet MS',fontSize:14,fontWeight:'bold'}
+				});
+				// Add the username to the view
+				post_view.add(user_label);
+
+				var date_label = Ti.UI.createLabel({
+					text:created_at,
+					right:0,
+					top:-18,
+					bottom:2,
+					height:14,
+					textAlign:'right',
+					width:110,
+					color:'#444444',
+					font:{fontFamily:'Trebuchet MS',fontSize:12}
+				});
+				// Add the date to the view
+				post_view.add(date_label);
+
+				var tweet_text = Ti.UI.createLabel({
+					text:tweet,
+					left:54,
+					top:0,
+					bottom:2,
+					height:'auto',
+					width:236,
+					textAlign:'left',
+					font:{fontSize:14}
+				});
+				// Add the tweet to the view
+				post_view.add(tweet_text);
+				// Add the vertical layout view to the row
+				row.add(post_view);
+				row.className = 'item'+c;
+				data[c] = row;
+			}
+			// Create the tableView and add it to the window.
+			var tableview = Titanium.UI.createTableView({data:data,minRowHeight:58});
+			Ti.UI.currentWindow.add(tableview);
+		}
+		catch(E){
+			alert(E);
+		}
+	};
+	// Get the data
+	xhr.send();
+}
+
 // Get the tweets for 'twitter_name'
 getTweets(twitter_name);
\ No newline at end of file
diff --git a/KitchenSink/Resources/examples/version.js b/KitchenSink/Resources/examples/version.js
index da9e42c..0abbdb0 100644
--- a/KitchenSink/Resources/examples/version.js
+++ b/KitchenSink/Resources/examples/version.js
@@ -6,9 +6,9 @@ function isIPhone3_2_Plus()
 	// add iphone specific tests
 	if (Titanium.Platform.name == 'iPhone OS')
 	{
-		var version = Titanium.Platform.version.split(".");
-		var major = parseInt(version[0]);
-		var minor = parseInt(version[1]);
+		var version = Titanium.Platform.version.split('.');
+		var major = parseInt(version[0], 10);
+		var minor = parseInt(version[1], 10);
 		
 		// can only test this support on a 3.2+ device
 		if (major > 3 || (major == 3 && minor > 1))
@@ -24,8 +24,8 @@ function isiOS4Plus()
 	// add iphone specific tests
 	if (Titanium.Platform.name == 'iPhone OS')
 	{
-		var version = Titanium.Platform.version.split(".");
-		var major = parseInt(version[0]);
+		var version = Titanium.Platform.version.split('.');
+		var major = parseInt(version[0], 10);
 		
 		// can only test this support on a 3.2+ device
 		if (major >= 4)
diff --git a/KitchenSink/Resources/examples/views.js b/KitchenSink/Resources/examples/views.js
index b551700..9d9634e 100644
--- a/KitchenSink/Resources/examples/views.js
+++ b/KitchenSink/Resources/examples/views.js
@@ -11,7 +11,7 @@ var data = [
 	{title:'Remove Views', hasChild:true, test:'../examples/remove_views.js'},
 	{title:'zIndex', hasChild:true, test:'../examples/views_zindex.js'},
     {title:'Email Dialog', hasChild:true, test:'../examples/email_dialog.js'},
-	{title:'Map View', hasChild:true, test:'../examples/map_view.js'},
+	{title:'Map View', hasChild:true, test:'../examples/map_view.js'}
 
 ];
 
diff --git a/KitchenSink/Resources/examples/views_zindex.js b/KitchenSink/Resources/examples/views_zindex.js
index d4d79d5..119ae9f 100644
--- a/KitchenSink/Resources/examples/views_zindex.js
+++ b/KitchenSink/Resources/examples/views_zindex.js
@@ -84,4 +84,4 @@ var l2 = Ti.UI.createLabel({
 	font:{fontSize:12}
 });
 
-win.add(l2)
\ No newline at end of file
+win.add(l2);
\ No newline at end of file
diff --git a/KitchenSink/Resources/examples/web_views.js b/KitchenSink/Resources/examples/web_views.js
index f283c5e..c87f870 100644
--- a/KitchenSink/Resources/examples/web_views.js
+++ b/KitchenSink/Resources/examples/web_views.js
@@ -58,7 +58,7 @@ tableview.addEventListener('click', function(e)
 	];
 
 	var webview = null;
-	if (rowdata.auto ==true)
+	if (rowdata.auto)
 	{
 		webview = Ti.UI.createWebView({height:'auto',width:'auto'});
 	}
@@ -207,7 +207,7 @@ tableview.addEventListener('click', function(e)
 		w.add(webview);
 		
 
-		function hideToolbar(e)
+		var hide = function(e)
 		{
 			Ti.API.info('received hidetoolbar event, foo = ' + e.foo);
 			if (Titanium.Platform.name == 'iPhone OS') {
@@ -217,9 +217,9 @@ tableview.addEventListener('click', function(e)
 					w.remove(toolbar);
 				}
 			}
-		}
+		};
 		// hide toolbar for local web view
-		Ti.App.addEventListener('webview_hidetoolbar', hideToolbar);
+		Ti.App.addEventListener('webview_hidetoolbar', hide);
 		
 		w.addEventListener('close',function(e)
 		{
@@ -227,7 +227,7 @@ tableview.addEventListener('click', function(e)
 			
 			// remove our global app event listener from this specific
 			// window instance when the window is closed
-			Ti.App.removeEventListener('webview_hidetoolbar',hideToolbar);
+			Ti.App.removeEventListener('webview_hidetoolbar',hide);
 		});
 		win.tab.open(w);		
 	}
diff --git a/KitchenSink/Resources/examples/webview_repaint.js b/KitchenSink/Resources/examples/webview_repaint.js
index 4fd16fd..ede6ce3 100644
--- a/KitchenSink/Resources/examples/webview_repaint.js
+++ b/KitchenSink/Resources/examples/webview_repaint.js
@@ -2,7 +2,7 @@ var win = Ti.UI.currentWindow;
 
 var webView = Ti.UI.createWebView({
 	url:'webview_repaint_source.html',
-	height:'auto',
+	height:'auto'
 	
 });
 
@@ -12,7 +12,7 @@ win.add(webView);
 var bb1 = Titanium.UI.createButtonBar({
 	labels:['+', '-'],
 	backgroundColor:'#336699',
-	style:Titanium.UI.iPhone.SystemButtonStyle.BAR,
+	style:Titanium.UI.iPhone.SystemButtonStyle.BAR
 });
 
 win.rightNavButton = bb1;
@@ -32,4 +32,4 @@ bb1.addEventListener('click', function(e)
 		Ti.App.fireEvent('fontchange', {amount:size});
 		webView.repaint();
 	}
-})
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/KitchenSink/Resources/examples/window_events.js b/KitchenSink/Resources/examples/window_events.js
index 1f9f5a3..be99346 100644
--- a/KitchenSink/Resources/examples/window_events.js
+++ b/KitchenSink/Resources/examples/window_events.js
@@ -257,7 +257,7 @@ win.addEventListener('blur', function()
 	var date = formatTime();
 	Titanium.App.Properties.setString('window_blur_event',  date);
 	blurLabel.text = 'Blur fired ' + date;
-	Ti.API.info('BLUR fired in window')
+	Ti.API.info('BLUR fired in window');
 });
 
 win.addEventListener('touchstart', function(e)
diff --git a/KitchenSink/Resources/examples/window_standalone.js b/KitchenSink/Resources/examples/window_standalone.js
index 8457170..2c58a25 100644
--- a/KitchenSink/Resources/examples/window_standalone.js
+++ b/KitchenSink/Resources/examples/window_standalone.js
@@ -112,7 +112,7 @@ b3.addEventListener('click', function()
 		backgroundColor:'#336699',
 		title:'Modal Window',
 		barColor:'black',
-		url:'vibrate.js',
+		url:'vibrate.js'
 	});
 	var b = Titanium.UI.createButton({
 		title:'Close',
diff --git a/KitchenSink/Resources/examples/window_toolbar.js b/KitchenSink/Resources/examples/window_toolbar.js
index 5440137..027dfdb 100644
--- a/KitchenSink/Resources/examples/window_toolbar.js
+++ b/KitchenSink/Resources/examples/window_toolbar.js
@@ -127,7 +127,7 @@ var b7 = Titanium.UI.createButton({
 	title:'Button With Image',
 	height:40,
 	width:200,
-	top:260,
+	top:260
 });
 b7.addEventListener('click', function()
 {
@@ -148,7 +148,7 @@ var b8 = Titanium.UI.createButton({
 	title:'Set Label',
 	height:40,
 	width:200,
-	top:310,
+	top:310
 });
 
 b8.addEventListener('click', function()
diff --git a/KitchenSink/Resources/examples/xhr_cookie.js b/KitchenSink/Resources/examples/xhr_cookie.js
index 9a8b6bd..62caabd 100644
--- a/KitchenSink/Resources/examples/xhr_cookie.js
+++ b/KitchenSink/Resources/examples/xhr_cookie.js
@@ -57,8 +57,8 @@ var gReader =
 		var MyRequest = Ti.Network.createHTTPClient(); 
 		MyRequest.open('GET', requestUrl);
 		MyRequest.onerror = function(e) {
-			Ti.API.info("Error: " + e.error);
-			label.text = "Error: " + e.error + "; (Http status " + this.status + ")";
+			Ti.API.info('Error: ' + e.error);
+			label.text = 'Error: ' + e.error + '; (Http status ' + this.status + ')';
 			navActInd.hide();
 		};
 		MyRequest.onload = function() 
@@ -66,12 +66,12 @@ var gReader =
 			try
 			{ 
 				var results = this.responseText; 
-				Ti.API.info("Request result: "+results);
-				var tokens = results.split("\n");
+				Ti.API.info('Request result: '+results);
+				var tokens = results.split('\n');
 				for (var c=0;c<tokens.length;c++)
 				{
 					var token = tokens[c];
-					var kv = token.split("=");
+					var kv = token.split('=');
 					if (kv[0]=='SID')
 					{
 						gReader.Sid = kv[1];
@@ -86,7 +86,7 @@ var gReader =
 			{ 
 				Ti.API.info('>>>>>>> Error In getSid ' + err ); 
 				navActInd.hide();
-				label.text="Failed: "+err;
+				label.text='Failed: '+err;
 			} 
 		};
 		MyRequest.send(); 
@@ -105,18 +105,18 @@ var gReader =
 			{ 
 				var results = this.responseText; 
 				gReader.Token=results; 
-								
-				label.text = /^[a-zA-Z0-9-]+$/.test(gReader.Token) ? ("Passed: "+results) : ("Failed: "+results);
+				var re = new RegExp('^[a-zA-Z0-9-]+$');
+				label.text = re.test(gReader.Token) ? ('Passed: '+results) : ('Failed: '+results);
 			} 
 			catch(err) { 
 				Ti.API.info('>>>>>>> Error In getToken ' + err ); 
-				label.text="Failed: "+err;
+				label.text='Failed: '+err;
 			} 
 		};
-		var requestCookies = "SID=" + gReader.Sid; 
-		var authorization = "GoogleLogin auth=" + gReader.Auth;
-		tokenRequest.setRequestHeader("Cookie", requestCookies); 
-		tokenRequest.setRequestHeader("Authorization", authorization);
+		var requestCookies = 'SID=' + gReader.Sid;
+		var authorization = 'GoogleLogin auth=' + gReader.Auth;
+		tokenRequest.setRequestHeader('Cookie', requestCookies);
+		tokenRequest.setRequestHeader('Authorization', authorization);
 		tokenRequest.send(); 
 	}, 
 	connect : function(username,password)
@@ -145,7 +145,7 @@ scrollView.add(label);
 
 button.addEventListener('click', function()
 {
-	label.text = "Testing Cookie";
+	label.text = 'Testing Cookie';
 	navActInd.show();
 	password.blur();
 	gReader.connect(username.value,password.value);
diff --git a/KitchenSink/Resources/examples/xhr_filedownload.js b/KitchenSink/Resources/examples/xhr_filedownload.js
index f308632..6599993 100644
--- a/KitchenSink/Resources/examples/xhr_filedownload.js
+++ b/KitchenSink/Resources/examples/xhr_filedownload.js
@@ -53,7 +53,7 @@ b1.addEventListener('click', function()
 	};
 	c.onerror = function(e)
 	{
-		Ti.API.info('XHR Error ' + e.error)
+		Ti.API.info('XHR Error ' + e.error);
 	};
 	
 	// open the client
diff --git a/KitchenSink/Resources/examples/xhr_settimeout.js b/KitchenSink/Resources/examples/xhr_settimeout.js
index 8fd5d4c..52167c4 100644
--- a/KitchenSink/Resources/examples/xhr_settimeout.js
+++ b/KitchenSink/Resources/examples/xhr_settimeout.js
@@ -25,44 +25,44 @@ win.add(button1);
 var withData = false;
 button1.addEventListener('click', function()
 {
+  // use any ip address that is not on the network
+  var notExistIP = 'http://192.168.1.23';
+
 	if (!withData)
 	{
 		withData=true;
-		label1.text = 'sending with data'
+		label1.text = 'sending with data';
 
-		var xhr = Ti.Network.createHTTPClient();
-		xhr.setTimeout(30000);
-		var start;
-		xhr.onload = function()
+		var xhrData = Ti.Network.createHTTPClient();
+		xhrData.setTimeout(30000);
+		var startData;
+		xhrData.onload = function()
 		{
 		    label1.text = 'Received the response.';
 		};
 
-		xhr.onerror = function(e)
+		xhrData.onerror = function(e)
 		{
 		    var now = new Date();
-		    var time = (((now - start) / 1000) | 0);
-		    label1.text = 'Registered error: time passed = ' + (now-start) + ' seconds';
-			Ti.API.info('error ' + e.error)
+		    var time = (((now - startData) / 1000) | 0);
+		    label1.text = 'Registered error: time passed = ' + (now-startData) + ' seconds';
+			Ti.API.info('error ' + e.error);
 		};
 
-		// use any ip address that is not on the network
-		var notExistIP = 'http://192.168.1.23';
-
 		// use any unreachable IP address
-		xhr.open('GET',notExistIP);
-		start = new Date();
+		xhrData.open('GET',notExistIP);
+		startData = new Date();
 		var data = {
 		    value1: 'value1',
 		    value2: 'value2'
 		};
 
-		xhr.send(data);
+		xhrData.send(data);
 	}
 	else
 	{
 		withData=false;
-		label1.text = 'sending without data'
+		label1.text = 'sending without data';
 		var xhr = Ti.Network.createHTTPClient();
 		xhr.setTimeout(30000);
 		var start;
@@ -76,13 +76,10 @@ button1.addEventListener('click', function()
 		    var now = new Date();
 		    var time = (((now - start) / 1000) | 0);
 		    label1.text = 'Registered error: time passed = ' + (now-start) + ' seconds';
-			Ti.API.info('error ' + e.error)
+			Ti.API.info('error ' + e.error);
 		
 		};
 
-		// use any ip address that is not on the network
-		var notExistIP = 'http://192.168.1.23';
-
 		// use any unreachable IP address
 		xhr.open('GET',notExistIP);
 		start = new Date();
diff --git a/KitchenSink/Resources/examples/xml_dom.js b/KitchenSink/Resources/examples/xml_dom.js
index ead8306..f756030 100644
--- a/KitchenSink/Resources/examples/xml_dom.js
+++ b/KitchenSink/Resources/examples/xml_dom.js
@@ -183,7 +183,7 @@ function nodewalker(node)
 			nodewalker(n);
 		}
 	}
-};
+}
 nodewalker(nodes.item(0));
 testResult = testResult && nodeCount==8;
 Ti.API.info('>>>>>>> Test 4 NodeCount: '+nodeCount);
@@ -220,27 +220,7 @@ Ti.API.info("Script is: "+JSON.stringify(scriptList));
 testResult = testResult && scriptList.length==1;
 testResult = testResult && xml.documentElement.firstChild.nodeName == "root";
 
-var nodeCount = 0;
-function nodewalker(node) 
-{
-	nodeCount++;
-	for (var i=0;i<node.childNodes.length;i++) 
-	{
-		if (i==0) 
-		{
-			nodewalker(node.firstChild);
-		} 
-		else 
-		{
-			var n = node.firstChild;
-			for (var x=0;x<i;x++) 
-			{
-				n = n.nextSibling;
-			}
-			nodewalker(n);
-		}
-	}
-};
+nodeCount = 0;
 nodewalker(rootList.item(0));
 testResult = testResult && nodeCount==1;
 Ti.API.info('>>>>>>> Test 5 NodeCount: '+nodeCount);
@@ -263,27 +243,7 @@ Ti.API.info("Script is: "+JSON.stringify(subdataList));
 testResult = testResult && dataList.length==3;
 testResult = testResult && xml.documentElement.firstChild.nodeName == "data";
 
-var nodeCount = 0;
-function nodewalker(node) 
-{
-	nodeCount++;
-	for (var i=0;i<node.childNodes.length;i++) 
-	{
-		if (i==0) 
-		{
-			nodewalker(node.firstChild);
-		} 
-		else 
-		{
-			var n = node.firstChild;
-			for (var x=0;x<i;x++) 
-			{
-				n = n.nextSibling;
-			}
-			nodewalker(n);
-		}
-	}
-};
+nodeCount = 0;
 nodewalker(subdataList.item(0));
 testResult = testResult && nodeCount==4;
 Ti.API.info('>>>>>>> Test 6 NodeCount: '+nodeCount);
diff --git a/KitchenSink/Resources/main_windows/base_ui.js b/KitchenSink/Resources/main_windows/base_ui.js
index 3a28274..f3fed75 100644
--- a/KitchenSink/Resources/main_windows/base_ui.js
+++ b/KitchenSink/Resources/main_windows/base_ui.js
@@ -71,7 +71,7 @@ Titanium.UI.currentWindow.add(tableview);
 Titanium.UI.currentWindow.addEventListener('focus', function()
 {
 	Ti.API.info('FOCUS RECEIVED IN base_ui');
-})
+});
 //
 //  ADD EVENT LISTENERS FOR CUSTOM EVENTS
 //
diff --git a/KitchenSink/build/iphone/Info.plist b/KitchenSink/build/iphone/Info.plist
index 43f2072..4cde0eb 100644
--- a/KitchenSink/build/iphone/Info.plist
+++ b/KitchenSink/build/iphone/Info.plist
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleIdentifier</key>
-	<string>com.appcelerator.kitchensink</string>
+	<string>com.appaccelerator.kitchensink</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
diff --git a/KitchenSink/build/iphone/Resources/.version b/KitchenSink/build/iphone/Resources/.version
index 98378a0..8357bb8 100644
--- a/KitchenSink/build/iphone/Resources/.version
+++ b/KitchenSink/build/iphone/Resources/.version
@@ -1 +1 @@
-/Users/kevin/Library/Application Support/Titanium/mobilesdk/osx/1.4.0/iphone,7189001d-fd7a-40ba-a089-ca73806a876f,576375ac78cf2fd2c3e0319d5b5d90e3,d1e8c8
\ No newline at end of file
+/Library/Application Support/Titanium/mobilesdk/osx/1.4.0/iphone,7189001d-fd7a-40ba-a089-ca73806a876f,576375ac78cf2fd2c3e0319d5b5d90e3,d1e8c8
\ No newline at end of file
diff --git a/KitchenSink/build/iphone/project.xcconfig b/KitchenSink/build/iphone/project.xcconfig
index c58f327..3ab9e1c 100644
--- a/KitchenSink/build/iphone/project.xcconfig
+++ b/KitchenSink/build/iphone/project.xcconfig
@@ -1,6 +1,6 @@
 TI_VERSION=1.4.0
-TI_SDK_DIR=/Users/kevin/Library/Application Support/Titanium/mobilesdk/osx/$(TI_VERSION)/iphone
-TI_APPID=com.appcelerator.kitchensink
+TI_SDK_DIR=/Library/Application Support/Titanium/mobilesdk/osx/$(TI_VERSION)/iphone
+TI_APPID=com.appaccelerator.kitchensink
 OTHER_LDFLAGS[sdk=iphoneos4*]=$(inherited) -weak_framework iAd
 OTHER_LDFLAGS[sdk=iphonesimulator4*]=$(inherited) -weak_framework iAd
 #include "module"
