diff --git a/MANIFEST.in b/MANIFEST.in
index e5a118b..ba78c47 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,3 @@
-include readme.txt
+include README.txt
 include release_notes.txt
+include requirements.txt
diff --git a/Makefile b/Makefile
index 8831249..6a09d33 100644
--- a/Makefile
+++ b/Makefile
@@ -7,12 +7,14 @@ all: clean
 
 clean:
 	rm -rf *~ *.pyc *.pyo
-	cd comictagger; rm -f *~ *.pyc *.pyo
-	sudo rm -rf dist MANIFEST
+	cd comictaggerlib; rm -f *~ *.pyc *.pyo
+	rm -rf dist MANIFEST
 	rm -rf *.deb
 	rm -rf logdict*.log
 	make -C mac clean
 	make -C windows clean
+	rm -rf build
+	mkdir -p release
 
 pydist:
 	rm -f release/*.zip
@@ -23,22 +25,26 @@ remove_test_install:
 	sudo rm -rf /usr/local/bin/comictagger.py
 	sudo rm -rf /usr/local/lib/python2.7/dist-packages/comictagger*
 	
-deb:
-	fpm -s python -t deb \
-		-n 'comictagger' \
-		--category 'utilities' \
-		--maintainer 'comictagger@gmail.com' \
-		--after-install debian_scripts/after_install.sh \
-		--before-remove debian_scripts/before_remove.sh \
-		-d 'python >= 2.6' \
-		-d 'python < 2.8' \
-		-d 'python-imaging >= 1.1.6' \
-		-d 'python-bs4 >= 4.1' \
-		setup.py 
-
-		# For now, don't require PyQt, since command-line is available without it
-		#-d 'python-qt4 >= 4.8' 
-
+#deb:
+#	fpm -s python -t deb \
+#		-n 'comictagger' \
+#		--category 'utilities' \
+#		--maintainer 'comictagger@gmail.com' \
+#		--after-install debian_scripts/after_install.sh \
+#		--before-remove debian_scripts/before_remove.sh \
+#		-d 'python >= 2.6' \
+#		-d 'python < 2.8' \
+#		-d 'python-imaging' \
+#		-d 'python-bs4' \
+#		--deb-suggests 'rar' \
+#		--deb-suggests 'unrar-free' \
+#		--python-install-bin /usr/share/comictagger \
+#		--python-install-lib /usr/share/comictagger \
+#		setup.py 
+#
+#		# For now, don't require PyQt, since command-line is available without it
+#		#-d 'python-qt4 >= 4.8' 
+		
 upload:
 	$(UPLOAD_TOOL) -p comictagger -s "ComicTagger $(VERSION_STR) Source" -l Featured,Type-Source -u beville -w $(PASSWORD) "release/comictagger-$(VERSION_STR).zip"
 	$(UPLOAD_TOOL) -p comictagger -s "ComicTagger $(VERSION_STR)  Mac OS X" -l Featured,Type-Archive -u beville -w $(PASSWORD) "release/ComicTagger-$(VERSION_STR).dmg"
diff --git a/readme.txt b/README.txt
similarity index 100%
rename from readme.txt
rename to README.txt
diff --git a/debian_scripts/after_install.sh b/debian_scripts/after_install.sh
deleted file mode 100755
index a0dc1c2..0000000
--- a/debian_scripts/after_install.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-mv /usr/bin/comictagger.py /usr/bin/comictagger
diff --git a/debian_scripts/before_remove.sh b/debian_scripts/before_remove.sh
deleted file mode 100755
index 5080842..0000000
--- a/debian_scripts/before_remove.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-mv /usr/bin/comictagger /usr/bin/comictagger.py
diff --git a/todo.txt b/todo.txt
index 02993cc..0753dbb 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,77 +1,76 @@
------------------------------------------------------
-Features
------------------------------------------------------
-	
-Rename dialog:
-	check-box for rows?
-	manual edit the preview?
-		
-Docs:
-	Auto-Tagging Tips:
-		Multiple Passes with different options
-
------------------------------------------------------
-Bugs	
------------------------------------------------------
-
-Zip flakes out when filename differs from index (or whatever)  i.e "\" vs "/". Python issue
-
------------------------------------------------------
-Big  Future Features
------------------------------------------------------
-
-GCD scraper or DB reader
-
-Batch Edit
-	Form Mode:  Single vs Batch
-	
------------------------------------------------------
-Small(er) Future Feature
------------------------------------------------------
-Parse out the rest of the scan info from filename
-
-Style sheets for windows/mac/linux
- 
-CLI
-	explicit metadata settings option format
-		-- figure out how to add CBI "tags"
-		-- delete CBI "tags"
-		-- set primary credit flags
-		-- set frontcover and others?
-
-Archive function to  detect tag blocks out of sync
-
-Settings
-	Add setting to dis-allow writing CBI to RAR
-
-Google App engine to store hashes 
-	Content Hashes, Image hashes, who knows?
-
-Filename parsing:
-	Rework how series name is separated from issue
-	
-Support marvel's "AU" issues...
-	Mostly done, gotta wait and see what CV does
-	
-Internal GenericMetadata - Make Characters, Genre into lists?
-
------------------------------------------------------
-Config Mgmt check list
------------------------------------------------------
-
-Release Process
-    Optionally, make screen shots, upload to wiki
-    Update release notes and wiki
-	Update ctversion.py
-	Build packages
-	    Make exe on Windows
-		Make dmg on Mac
-		Make zip on Mac or Linux
-    Tag the repository
-	Upload packages
-	Announce on Forum and Main Page
-	
-----------------------------------------------
-
-	
-rename 's/([A-Za-z]+)(\d+)(.cb[rz])/$1 $2$3/' *.cb?
+-----------------------------------------------------
+Features
+-----------------------------------------------------
+Rename dialog:
+	check-box for rows?
+	manual edit the preview?
+		
+Docs:
+	Auto-Tagging Tips:
+		Multiple Passes with different options
+		
+-----------------------------------------------------
+Bugs	
+-----------------------------------------------------
+
+Zip flakes out when filename differs from index (or whatever)  i.e "\" vs "/". Python issue
+
+-----------------------------------------------------
+Big  Future Features
+-----------------------------------------------------
+
+GCD scraper or DB reader
+
+Batch Edit
+	Form Mode:  Single vs Batch
+	
+-----------------------------------------------------
+Small(er) Future Feature
+-----------------------------------------------------
+Parse out the rest of the scan info from filename
+
+Style sheets for windows/mac/linux
+ 
+CLI
+	explicit metadata settings option format
+		-- figure out how to add CBI "tags"
+		-- delete CBI "tags"
+		-- set primary credit flags
+		-- set frontcover and others?
+
+Archive function to  detect tag blocks out of sync
+
+Settings
+	Add setting to dis-allow writing CBI to RAR
+
+Google App engine to store hashes 
+	Content Hashes, Image hashes, who knows?
+
+Filename parsing:
+	Rework how series name is separated from issue
+	
+Support marvel's "AU" issues...
+	Mostly done, gotta wait and see what CV does
+	
+Internal GenericMetadata - Make Characters, Genre into lists?
+
+-----------------------------------------------------
+Config Mgmt check list
+-----------------------------------------------------
+
+Release Process
+    Optionally, make screen shots, upload to wiki
+    Update release notes and wiki
+	Update ctversion.py
+	Build packages
+	    Make exe on Windows
+		Make dmg on Mac
+		Make zip on Mac or Linux
+    Tag the repository
+	Upload packages
+	Announce on Forum and Main Page
+	
+----------------------------------------------
+
+	
+rename 's/([A-Za-z]+)(\d+)(.cb[rz])/$1 $2$3/' *.cb?
diff --git a/windows/Makefile b/windows/Makefile
index bc0340e..539cb05 100644
--- a/windows/Makefile
+++ b/windows/Makefile
@@ -1,11 +1,12 @@
 # This Makefile expects that certain GNU utils are available:
 # rm, cp, grep, cut, cat
 
-TAGGER_BASE:= c:\Users\tony\Dropbox\tagger\comictagger
-TAGGER_SRC := $(TAGGER_BASE)\comictaggerlib
+HOMEPATH ?= $(HOME)
+TAGGER_BASE:= $(HOMEPATH)/Dropbox/tagger/comictagger
+TAGGER_SRC := $(TAGGER_BASE)/comictaggerlib
 DIST_DIR := $(TAGGER_BASE)\windows\dist
 NSIS_CMD :=	"C:\Program Files (x86)\NSIS\makensis.exe"
-VERSION := $(shell grep version "$(TAGGER_SRC)\ctversion.py" | cut -d= -f2)
+VERSION := $(shell grep version "$(TAGGER_SRC)/ctversion.py" | cut -d= -f2)
 
 all: clean dist package
 
@@ -28,9 +29,3 @@ package:
 
 clean:
 	-rm -rf dist
-	-rm -f "*~" *.pyc *.pyo
-	-rm -f "$(TAGGER_BASE)\windows\*.exe"
-
-test:
-	echo !define RELEASE_STR $(VERSION) > test.nsh
-