--- C:\Users\alistair\Documents\Projects\pdfmod\src\PdfMod\Gui\DocumentIconView.cs
+++ C:\Users\alistair\Documents\Projects\pdfmod - Copy TO UPDATE DEPS - Copy - Copy\src\PdfMod\Gui\DocumentIconView.cs
@@ -338,7 +338,9 @@
                 document.AddFromUri (new Uri (uri), to_index, pages);
                 args.RetVal = true;
             } else if (target == uri_src_target.Target) {
                var uris = System.Text.Encoding.UTF8.GetString (args.SelectionData.Data).Split (newline, StringSplitOptions.RemoveEmptyEntries);
+				// Alister: I'm guessing the RemoveEmptyEntries is intended to avoid the problem with the empty string that I describe below?
+				// It doesn't seem to work on Windows - I'm assuming this is a CR/LF thing.  It will not accept Environment.NewLine instead.
                 if (uris.Length == 1 && app.Document == null) {
                     app.LoadPath (uris[0]);
                     args.RetVal = true;
@@ -350,7 +352,9 @@
                         // TODO somehow ask user for which pages of the docs to insert?
                         // TODO pwd handling - keyring#?
                         // TODO make action/undoable
-                        for (; uri_i < uris.Length; uri_i++) {
+						// Alister: On Windows there always seems to be an empty string on the end of the list, which causes a crash, so we need to ignore it
+						// Perhaps it would be better to test whether each uri is actually valid?
+                        for (; uri_i < uris.Length - 1 ; uri_i++) {
                             var before_count = document.Count;
                             document.AddFromUri (new Uri (uris[uri_i]), to_index);
                             to_index += document.Count - before_count;
--- C:\Users\alistair\Documents\Projects\pdfmod\src\PdfMod\Gui\Client.cs
+++ C:\Users\alistair\Documents\Projects\pdfmod - Copy TO UPDATE DEPS - Copy - Copy\src\PdfMod\Gui\Client.cs
@@ -125,8 +125,10 @@
             HeaderToolbar.ShowArrow = false;
             HeaderToolbar.ToolbarStyle = ToolbarStyle.Icons;
             HeaderToolbar.Tooltips = true;
             HeaderToolbar.NoShowAll = true;
-            HeaderToolbar.Visible = Configuration.ShowToolbar;
+            //Alister: disabled till we implement in gsettings
+			//HeaderToolbar.Visible = Configuration.ShowToolbar;
+			HeaderToolbar.Visible = true;
 
             // BookmarksView
             BookmarkView = new BookmarkView (this);
@@ -190,6 +192,7 @@
             if (--app_count == 0) {
                 try {
                     Directory.CreateDirectory (Path.GetDirectoryName (accel_map_file));
+// Alister: this crashes sometimes
                     Gtk.AccelMap.Save (accel_map_file);
                 } catch (Exception e) {
                     Hyena.Log.Exception ("Failed to save custom AccelMap", e);
@@ -272,7 +275,7 @@
                 path = System.IO.Path.GetFullPath (path);
             }
 
-            Configuration.LastOpenFolder = System.IO.Path.GetDirectoryName (suggestedFilename ?? path);
+            //Configuration.LastOpenFolder = System.IO.Path.GetDirectoryName (suggestedFilename ?? path);
             status_label.Text = Catalog.GetString ("Loading document...");
 
             ThreadAssist.SpawnFromMain (delegate {
@@ -286,7 +289,7 @@
                     ThreadAssist.BlockingProxyToMain (delegate {
                         IconView.SetDocument (Document);
                         BookmarkView.SetDocument (Document);
-                        RecentManager.Default.AddItem (Document.Uri);
+						RecentManager.Default.AddItem (Document.Uri);
 
                         Document.Changed += UpdateForDocument;
                         UpdateForDocument ();
@@ -298,7 +301,7 @@
                         status_label.Text = "";
                         if (e is System.IO.FileNotFoundException) {
                             try {
-                                RecentManager.Default.RemoveItem (new Uri(path).AbsoluteUri);
+								RecentManager.Default.RemoveItem (new Uri(path).AbsoluteUri);
                             } catch {}
                         }
                     });
--- C:\Users\alistair\Documents\Projects\pdfmod\src\PdfMod\Gui\BookmarkView.cs
+++ C:\Users\alistair\Documents\Projects\pdfmod - update pdfsharp\src\PdfMod\Gui\BookmarkView.cs
@@ -70,7 +70,10 @@
             AddOutlineCollection (document, document.Pdf.Outlines, TreeIter.Zero);
             UpdateActions ();
 
-            Visible = Client.Configuration.ShowBookmarks;
+
+			//Alister: disabled till we implement in gsettings
+			//Visible = Client.Configuration.ShowBookmarks;
+            Visible = true;
         }
 
         // Bookmark action handlers
--- C:\Users\alistair\Documents\Projects\pdfmod\src\PdfMod\Gui\Actions.cs
+++ C:\Users\alistair\Documents\Projects\pdfmod - Copy TO UPDATE DEPS - Copy - Copy\src\PdfMod\Gui\Actions.cs
@@ -46,8 +46,9 @@
 
         static string [] require_doc_actions = new string[] {
             "Save", "SaveAs", "Properties", "Undo", "Redo", "ZoomFit", "OpenInViewer",
-            "SelectAll", "SelectEvens", "SelectOdds", "SelectMatching", "SelectInverse", "InsertFrom",
-            "ViewBookmarks", "AddBookmark", "EditBookmarks"
+			"SelectAll", "SelectEvens", "SelectOdds", "SelectMatching", "SelectInverse", "InsertFrom"//,
+			//Alister: disabled till we implement in gsettings
+ //           "ViewBookmarks", "AddBookmark", "EditBookmarks"
         };
 
         static string [] require_page_actions = new string[] {
@@ -75,9 +76,9 @@
                 new ActionEntry ("Redo", Stock.Redo, null, "<control>y", null, OnRedo),
                 new ActionEntry ("Extract", Gtk.Stock.New, null, null, null, OnExtractPages),
                 new ActionEntry ("Remove", Gtk.Stock.Remove, null, "Delete", null, OnRemove),
-                new ActionEntry ("RotateLeft", null, Catalog.GetString ("Rotate Left"), "bracketleft", Catalog.GetString ("Rotate left"), OnRotateLeft),
-                new ActionEntry ("RotateRight", null, Catalog.GetString ("Rotate Right"), "bracketright", Catalog.GetString ("Rotate right"), OnRotateRight),
-                new ActionEntry ("ExportImages", null, null, null, null, OnExportImages),
+                new ActionEntry ("RotateLeft", Gtk.Stock.Undo, Catalog.GetString ("Rotate Left"), "bracketleft", Catalog.GetString ("Rotate left"), OnRotateLeft),
+                new ActionEntry ("RotateRight", Gtk.Stock.Redo, Catalog.GetString ("Rotate Right"), "bracketright", Catalog.GetString ("Rotate right"), OnRotateRight),
+                new ActionEntry ("ExportImages", Gtk.Stock.Convert, null, null, null, OnExportImages),
                 new ActionEntry ("SelectAll", Stock.SelectAll, null, "<control>A", null, OnSelectAll),
                 new ActionEntry ("SelectOdds", null, Catalog.GetString ("Select Odd Pages"), null, null, OnSelectOdds),
                 new ActionEntry ("SelectEvens", null, Catalog.GetString ("Select Even Pages"), null, null, OnSelectEvens),
@@ -109,17 +110,19 @@
 
             AddImportant (
                 new ToggleActionEntry ("Properties", Stock.Properties, null, "<alt>Return", Catalog.GetString ("View and edit the title, keywords, and more for this document"), OnProperties, false),
                 new ToggleActionEntry ("ZoomFit", Stock.ZoomFit, null, "<control>0", null, OnZoomFit, true),
-                new ToggleActionEntry ("ViewToolbar", null, Catalog.GetString ("Toolbar"), null, null, OnViewToolbar, Client.Configuration.ShowToolbar),
-                new ToggleActionEntry ("ViewBookmarks", null, Catalog.GetString ("Bookmarks"), "F9", null, OnViewBookmarks, Client.Configuration.ShowBookmarks),
+				//Alister: disabled till we implement in gsettings
+                //new ToggleActionEntry ("ViewToolbar", null, Catalog.GetString ("Toolbar"), null, null, OnViewToolbar, Client.Configuration.ShowToolbar),
+                //new ToggleActionEntry ("ViewBookmarks", null, Catalog.GetString ("Bookmarks"), "F9", null, OnViewBookmarks, Client.Configuration.ShowBookmarks),
                 new ToggleActionEntry ("FullScreenView", null, Catalog.GetString ("Fullscreen"), "F11", null, OnFullScreenView, false)
             );
 
             this["RotateRight"].IconName = "object-rotate-right";
             this["RotateLeft"].IconName = "object-rotate-left";
             this["ExportImages"].IconName = "image-x-generic";
-            this["ViewBookmarks"].IconName = "user-bookmarks";
-            this["AddBookmark"].IconName = "bookmark-new";
+			//Alister: disabled for now
+            //this["ViewBookmarks"].IconName = "user-bookmarks";
+            //this["AddBookmark"].IconName = "bookmark-new";
 
             UpdateAction ("Help", true);
 
@@ -141,7 +144,7 @@
             AddAccel ("/MainMenu/FileMenu/Close",   Gdk.ModifierType.ControlMask, Gdk.Key.q);
             AddAccel ("/MainMenu/EditMenu/Redo",    Gdk.ModifierType.ControlMask | Gdk.ModifierType.ShiftMask, Gdk.Key.z);
 
-            // Set up recent documents menu
+			// Set up recent documents menu
             MenuItem recent_item = ActionManager.UIManager.GetWidget ("/MainMenu/FileMenu/RecentMenu") as MenuItem;
             var recent_chooser_item = new RecentChooserMenu (RecentManager.Default) {
                 Filter = new RecentFilter (),
@@ -151,7 +154,7 @@
             recent_chooser_item.ItemActivated += delegate {
                 Client.RunIdle (delegate { app.LoadPath (recent_chooser_item.CurrentUri); });
             };
-            recent_item.Submenu = recent_chooser_item;
+		recent_item.Submenu = recent_chooser_item;
         }
 
         private void AddAccel (string path, Gdk.ModifierType modifier, params Gdk.Key [] keys)
@@ -233,7 +236,7 @@
             if (app.Document != null) {
                 chooser.SetCurrentFolder (System.IO.Path.GetDirectoryName (app.Document.SuggestedSavePath));
             } else {
-                chooser.SetCurrentFolder (Client.Configuration.LastOpenFolder);
+                //chooser.SetCurrentFolder (Client.Configuration.LastOpenFolder);
             }
 
             var response = chooser.Run ();
@@ -463,16 +471,17 @@
         void OnViewToolbar (object o, EventArgs args)
         {
             bool show = (this["ViewToolbar"] as ToggleAction).Active;
-            Client.Configuration.ShowToolbar = app.HeaderToolbar.Visible = show;
+            //Client.Configuration.ShowToolbar = app.HeaderToolbar.Visible = show;
         }
 
         void OnViewBookmarks (object o, EventArgs args)
-        {
-            bool show = (this["ViewBookmarks"] as ToggleAction).Active;
-            Client.Configuration.ShowBookmarks = app.BookmarkView.Visible = show;
-            if (app.BookmarkView.Visible) {
-                app.BookmarkView.GrabFocus ();
-            }
+		{
+			//Alister: disabled till we implement in gsettings
+            //bool show = (this["ViewBookmarks"] as ToggleAction).Active;
+            //Client.Configuration.ShowBookmarks = app.BookmarkView.Visible = show;
+            //if (app.BookmarkView.Visible) {
+            //    app.BookmarkView.GrabFocus ();
+            //}
         }
 
         // Help menu actions
@@ -592,9 +601,10 @@
 
         void OnEditBookmarks (object o, EventArgs args)
         {
-            if (!app.BookmarkView.Visible) {
-                (this["ViewBookmarks"] as ToggleAction).Active = true;
-            }
+            //Alister - disable for now
+			//if (!app.BookmarkView.Visible) {
+                //(this["ViewBookmarks"] as ToggleAction).Active = true;
+            //}
         }
 
         void OnBookmarkContextMenu (object o, EventArgs args)
--- C:\Users\alistair\Documents\Projects\pdfmod\src\PdfMod\Core\Client.cs
+++ C:\Users\alistair\Documents\Projects\pdfmod - Copy TO UPDATE DEPS - Copy - Copy\src\PdfMod\Core\Client.cs
@@ -31,14 +31,16 @@
         static readonly string old_cache_dir = Path.Combine (System.Environment.GetFolderPath (System.Environment.SpecialFolder.ApplicationData), "pdfmod");
         static readonly string CacheDir = Path.Combine (XdgBaseDirectorySpec.GetUserDirectory ("XDG_CACHE_HOME", ".cache"), "pdfmod");
 
         public Document Document { get; protected set; }
-        public static Configuration Configuration { get; private set; }
+		//Alister: disabled till we implement in gsettings
+        //public static Configuration Configuration { get; private set; }
 
         public event EventHandler DocumentLoaded;
 
         static Client ()
        {
-            Configuration = new Configuration ();
+			//Alister: disabled till we implement in gsettings
+            //Configuration = new Configuration ();
             InitCache ();
         }