diff --git a/.gitignore b/.gitignore
index 6f6770d..44a1ee8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@
 asc2c
 tines
 test.*
+pkgs/
+tines.work*
\ No newline at end of file
diff --git a/Makefile b/Makefile
index b831c02..5ba0898 100644
--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,17 @@
 
 # Arguments to install
 # Use this one for Linux
-INSTFLAGS=-D
+# INSTFLAGS=-D
 # Use this one for MacOSX, BSD, and Cygwin
-# INSTFLAGS=-d
+INSTFLAGS=-d
 
 # Install directories
 BINDIR=/usr/local/bin
 MANDIR=/usr/local/man
 SHAREDIR=/usr/local/share/tines
+PKGBINDIR=ar/bin
+PKGMANDIR=ar/man
+PKGSHAREDIR=ar/share/tines
 
 # Override the shell builtin echo
 ECHO=/bin/echo
diff --git a/README.md b/README.md
index d59e96a..ab5df7d 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Tines is a console-based outliner/planner/notebook.
 It is a fork of the hnb outliner,
 which has not been updated in over 10 years.
 
-The current version is 1.10. See the [Changelog](https://github.com/larrykollar/tines/wiki/Changelog.md) for a list of new features.
+The current version is 1.11.1. See the [Changelog](https://github.com/larrykollar/tines/wiki/Changelog.md) for a list of new features.
 
 See the ROADMAP file for further planned updates
 along the way to version 2.0 and beyond.
diff --git a/extras/tinesdoc.ms b/extras/tinesdoc.ms
index 74f02e6..711742e 100644
--- a/extras/tinesdoc.ms
+++ b/extras/tinesdoc.ms
@@ -691,7 +691,7 @@ savepos (integer)
 .LP
 If true, saves the current position along with the data. Supported in both hnb and OPML formats.
 .LP
-On save, Tines inserts a \<?pos="x"?> processing instruction, where x is the current position. When reading the file, Tines sets the current position to the value found in the processing instruction.
+On save, Tines inserts a \<?tines pos="x"?> processing instruction, where x is the current position. When reading the file, Tines sets the current position to the value found in the processing instruction.
 .NH 3
 readonly (integer)
 .LP
diff --git a/src/config.h b/src/config.h
index ddcc3a6..75dd6cc 100644
--- a/src/config.h
+++ b/src/config.h
@@ -1,6 +1,6 @@
 
 #define PACKAGE "tines"
-#define VERSION "1.10.2"
+#define VERSION "1.11.1"
 #define SHAREDIR "/usr/local/share/tines/"
 #define RCFILEIN "tinesrc"
 #define RCFILEOUT ".tinesrc"
diff --git a/src/file_xml.c b/src/file_xml.c
index 3b4327d..78fe9eb 100644
--- a/src/file_xml.c
+++ b/src/file_xml.c
@@ -1,7 +1,7 @@
 /*
  * file_ascii.c -- generic xml import/export filters for hnb
  *
- * Copyright (C) 2001-2003 Øyvind Kolås <pippin@users.sourceforge.net>
+ * Copyright (C) 2001-2003 Øyvind Kolås <pippin@users.sourceforge.net>
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of the GNU General Public License as published by the Free
diff --git a/src/ui_draw.c b/src/ui_draw.c
index 854c570..49609b8 100644
--- a/src/ui_draw.c
+++ b/src/ui_draw.c
@@ -43,6 +43,9 @@ extern int nodes_above;
 extern int active_line;
 extern int nodes_below;
 
+extern int tines_nodes_up;
+extern int tines_nodes_down;
+
 static Node *up (Node *sel, Node *node)
 {
 	if (node_up (node) && node_getflag( node_up (node), F_expanded)) {
@@ -731,9 +734,6 @@ void ui_draw (Node *node, char *input, int edit_mode)
 {
 	int lines;
 
-	int hnb_nodes_up;
-	int hnb_nodes_down;
-
 	static struct {
 		long self;
 		long prev;
@@ -787,8 +787,8 @@ void ui_draw (Node *node, char *input, int edit_mode)
 	nodes_below = LINES - active_line;
 
 	{
-		hnb_nodes_up = 0;
-		hnb_nodes_down = 0;
+		tines_nodes_up = 0;
+		tines_nodes_down = 0;
 
 		erase ();
 /* draw nodes above selected node */
@@ -805,7 +805,7 @@ void ui_draw (Node *node, char *input, int edit_mode)
 				line_nodeno[line] = node_no (tnode);
 
 				if (node_down (tnode) == prev_down) {
-					hnb_nodes_up++;
+					tines_nodes_up++;
 					prev_down = tnode;
 				}
 
@@ -839,7 +839,7 @@ void ui_draw (Node *node, char *input, int edit_mode)
 				lines += draw_item (lines, 0, tnode, drawmode_normal);
 
 				if (node_up (tnode) == prev_up) {
-					hnb_nodes_down++;
+					tines_nodes_down++;
 					prev_up = tnode;
 				}
 
@@ -857,8 +857,8 @@ void ui_draw (Node *node, char *input, int edit_mode)
 
 /*	refresh ();*/
 
-	hnb_nodes_up++;
-	hnb_nodes_down++;
+	tines_nodes_up++;
+	tines_nodes_down++;
 }
 
 /*