diff --git a/ui/data.js b/ui/data.js
index 63200f13..f8fbad0a 100755
--- a/ui/data.js
+++ b/ui/data.js
@@ -39,11 +39,13 @@
 // 			- will auto-sort marks on load of 2.0 data and change 
 // 			  data version to 2.1, will need a re-save,
 // 	2.2 - Minor update to how data is handled and saved
-// 			- now DATA.current is saved separately in current.json
+// 			- now DATA.current is saved separately in current.json,
 // 			  loading is done from current.json and if not found from
-// 			  data.json
+// 			  data.json.
+// 			  the file is optional.
 // 			- data, marks, bookmarks, tags are now saved only if updated
 //
+//
 // NOTE: Gen1 and Gen3 refer to code generations rather than data format
 // 		iterations, Gen2 is skipped here as it is a different project 
 // 		(PortableMag) started on the same code base as ImageGrid.Viewer
@@ -2215,6 +2217,8 @@ function alignRibbons(ribbon){
 
 	DATA = alignDataToRibbon(ribbon)
 
+	dataUpdated()
+
 	$('.viewer').trigger('ribbonsAligned', [ribbon])
 
 	reloadViewer(false)
@@ -2258,6 +2262,8 @@ function loadRibbonsFromPath(path, cmp, reverse, dir_name){
 	// 		speed-wise, but will make the code simpler...
 	DATA.ribbons = ribbonsFromFavDirs(path, null, null, dir_name)
 
+	dataUpdated()
+
 	// do the sort...
 	if(cmp != false){
 		sortImages(cmp, reverse)
@@ -2300,9 +2306,6 @@ function setupData(viewer){
 			'shiftedImage',
 			'createdRibbon',
 			'removedRibbon',
-			// data.js API...
-			'ribbonsAligned',
-			'ribbonsLoadedFromPath',
 		].join(' '), function(){
 			dataUpdated()
 		})
diff --git a/ui/sort.js b/ui/sort.js
index b785e446..932ba32c 100755
--- a/ui/sort.js
+++ b/ui/sort.js
@@ -180,8 +180,10 @@ function reverseImageOrder(){
 	DATA.ribbons.forEach(function(r){
 		r.reverse()
 	})
-	reloadViewer(true)
-	$('.viewer').trigger('reversedImageOrder', [cmp])
+	reloadViewer()
+	dataUpdated()
+
+	$('.viewer').trigger('reversedImageOrder')
 }
 
 
@@ -195,6 +197,8 @@ function sortImages(cmp, reverse){
 		DATA.order.reverse()
 	}
 	updateRibbonOrder()
+	dataUpdated()
+
 	$('.viewer').trigger('sortedImages', [cmp])
 }
 
@@ -311,6 +315,8 @@ function sortImagesByFileNameSeqWithOverflow(reverse, proximity, overflow_gap, c
 	}
 
 	updateRibbonOrder()
+	dataUpdated()
+	
 	$('.viewer').trigger('sortedImagesByFileNameSeqWithOverflow')
 }
 
@@ -356,6 +362,8 @@ function horizontalShiftImage(image, direction){
 
 	// update stuff that changed, mainly order...
 	updateImages()
+	dataUpdated()
+
 	$('.viewer').trigger('horizontalSiftedImage', [gid, direction])
 
 	return image
@@ -423,26 +431,6 @@ function sortImagesDialog(){
 }
 
 
-/*********************************************************************/
-
-function setupSorting(viewer){
-	console.log('Sorting: setup...')
-
-	return viewer
-		// NOTE: manual data manipulation will dataUpdated() called 
-		// 		manually...
-		.on([
-			'reversedImageOrder',
-			'sortedImages',
-			'sortedImagesByFileNameSeqWithOverflow',
-			'horizontalSiftedImage'
-		].join(' '), function(){
-			dataUpdated()
-		})
-}
-SETUP_BINDINGS.push(setupSorting)
-
-
 
 /**********************************************************************
 * vim:set ts=4 sw=4 :                                                */