diff --git a/TODO.otl b/TODO.otl
index 10fcdc2..7a3b323 100755
--- a/TODO.otl
+++ b/TODO.otl
@@ -5,8 +5,15 @@
 		| touchdown point.
 		[_] BUG: no drag threshold on excludedElements (TouchSwipe)
 		| stalled...
-	[_] 64% general todo
+	[_] 65% general todo
 		[_] BUG: loading a magazine with position set to 0 will align it incorrectly.
+		| needs testing with the rewritten fitNPages()...
+		[_] Editor: might be a good idea to prevent deleting the last page...
+		| this can be done in two ways:
+		| 	- deleting the last page actually replaces it with a blank
+		| 	- deleting the last page will also delete the empty article/magazine
+		[_] Editor: page marking and grouping...
+		| also edit the group properties...
 		[_] editor mode service page
 		| a virtual page at the end of the magazine with magazine-specific
 		| settings.
@@ -22,12 +29,9 @@
 			| global, magazine, article
 			[_] drag full page
 			| global, magazine
-		[_] Editor: add page-set support...
 		[_] Editor: add basic control toolbars...
 		[_] Editor: add toggleEditiorMode to all editables in all versions...
 		| text areas, inputs, ...
-		[_] Editor: make the editor switchable...
-		| if it is imported it should be able to switch on and off on demand...
 		[_] add global credits and copyright page...
 		| list and link all the used software and authors...
 		[_] add default empty state to viewer, magazine and article...
@@ -85,6 +89,8 @@
 		[_] BUG: href to existing anchors will mess up layout...
 		| need to find out how can we disable anchor links from actually
 		| going to the anchor...
+		[X] Editor: make the editor switchable...
+		| if it is imported it should be able to switch on and off on demand...
 		[X] BUG: togglePageView results in jumpy animation if USE_REAL_PAGE_SIZES is set
 		| this does not happen if USE_REAL_PAGE_SIZES is set and FIT_PAGE_TO_VIEW 
 		| is unset...