diff --git a/Makefile.windows b/Makefile.windows
index 4fe6098..698a212 100644
--- a/Makefile.windows
+++ b/Makefile.windows
@@ -1,5 +1,5 @@
 netmapr:	netmapr.c constants.h netmapr.h Makefile
-	gcc -mwindows -mno-cygwin -Wall -onetmapr.exe -O2 -g netmapr.c windows_files/attachicon.res `sdl-config --cflags --libs` -I/usr/local/include -lmingw32 -L/usr/local/lib -lSDLmain -lSDL -lSDL_ttf 
+	gcc -mwindows -mno-cygwin -Wall -onetmapr.exe -O2 -g savepng.c netmapr.c windows_files/attachicon.res `sdl-config --cflags --libs` -I/usr/local/include -lmingw32 -L/usr/local/lib -lSDLmain -lSDL -lSDL_ttf  -lpng
 
 convert:	convert.c convert.h Makefile
 	gcc -Wall -g convert.c -I/usr/local/include -oconvert -lmingw32 -L/usr/local/lib -lSDLmain -lSDL
diff --git a/dist.sh b/dist.sh
index 9297111..e7f6587 100755
--- a/dist.sh
+++ b/dist.sh
@@ -8,8 +8,10 @@ WINFILE=${FULLNAME}-win32.zip
 mkdir ${FULLNAME}
 cp README.txt INSTALL.txt Makefile.linux Makefile.freebsd Makefile.windows objects.dat buttons.dat netmapr.c netmapr.h constants.h convert.c convert.h icon.bmp verdana.ttf example.map ${FULLNAME}/
 cp -R doc ${FULLNAME}/
+cp -R windows_files ${FULLNAME}/
 rm -rf ${FULLNAME}/doc/CVS
 rm -rf ${FULLNAME}/doc/.svn
+rm -rf ${FULLNAME}/windows_files/.svn
 tar zcvf ${TARFILE} ${FULLNAME}
 rm -rf ${FULLNAME}
 
diff --git a/netmapr.c b/netmapr.c
index abd20fd..07bf1e0 100644
--- a/netmapr.c
+++ b/netmapr.c
@@ -218,6 +218,7 @@ int main (int argc, char **argv) {
 	if (autoload) {
 		loadmap();
 		strcpy(text, "");
+		textpos = text;
 	}
 
 
@@ -912,6 +913,7 @@ int main (int argc, char **argv) {
 							starty = ((screen->h - STATUSH)/2)-2;
 							bg = NULL;
 							strcpy(text, map[curmap].name);
+							textpos = &text[strlen(text)];
 							changestate(S_MAPNAMING);
 							drawmap(TRUE);
 							break;
@@ -1690,7 +1692,6 @@ int main (int argc, char **argv) {
 					}
 					/* state dependant */
 					if ((state == S_TYPETEXT) || (state == S_SAVING) || (state == S_LOADING) || (state == S_MAPNAMING) || (state == S_EDITTEXT) || (state == S_SEARCH)) {
-// ooooooooooooooo
 						if ((c2 == 'u') && (mod & KMOD_CTRL)) {
 							// delete from start to text pos
 							strcpy(text, textpos);
@@ -1739,7 +1740,6 @@ int main (int argc, char **argv) {
 						} else if (c2 == SDLK_RIGHT) {
 							if (textpos != &text[strlen(text)]) textpos++;
 							updatetextcursor();
-//oooooooooo
 						} else if ((c2 == SDLK_ESCAPE) ||  
 							  ((c2 == 'g') && (mod & KMOD_CTRL)) ) {
 							sprintf(statustext, "Aborted.");
@@ -1823,6 +1823,7 @@ int main (int argc, char **argv) {
 								starty = ((screen->h-STATUSH)/2)-2;
 								bg = NULL;
 								strcpy(text, "");
+								textpos = text;
 								changestate(S_SEARCH);
 								drawmap(TRUE);
 							}
diff --git a/windows_files/libpng12-0.dll b/windows_files/libpng12-0.dll
deleted file mode 100755
index 23a6d30..0000000
Binary files a/windows_files/libpng12-0.dll and /dev/null differ
diff --git a/windows_files/libpng13.dll b/windows_files/libpng13.dll
new file mode 100644
index 0000000..e328d39
Binary files /dev/null and b/windows_files/libpng13.dll differ