diff --git a/comicarchive.py b/comicarchive.py
index b7bece9..732b1bf 100644
--- a/comicarchive.py
+++ b/comicarchive.py
@@ -2,6 +2,22 @@
 A python class to represent a single comic, be it file or folder of images
 """
 
+"""
+Copyright 2012  Anthony Beville
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
 import zipfile
 import os
 import struct
diff --git a/comicbookinfo.py b/comicbookinfo.py
index d706817..23d41ea 100644
--- a/comicbookinfo.py
+++ b/comicbookinfo.py
@@ -2,6 +2,23 @@
 A python class to encapsulate the ComicBookInfo data and file handling
 """
 
+"""
+Copyright 2012  Anthony Beville
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+
 import json
 from datetime import datetime
 import zipfile
diff --git a/comicinfoxml.py b/comicinfoxml.py
index 5f2e5dd..efa56b9 100644
--- a/comicinfoxml.py
+++ b/comicinfoxml.py
@@ -2,6 +2,22 @@
 A python class to encapsulate ComicRack's ComicInfo.xml data and file handling
 """
 
+"""
+Copyright 2012  Anthony Beville
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
 from datetime import datetime
 import zipfile
 from pprint import pprint 
diff --git a/comicvinetalker.py b/comicvinetalker.py
index f3e26ca..507e592 100644
--- a/comicvinetalker.py
+++ b/comicvinetalker.py
@@ -1,3 +1,24 @@
+"""
+A python class to manage communication with Comic Vine's REST API
+"""
+
+"""
+Copyright 2012  Anthony Beville
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+
 import json
 from pprint import pprint 
 import urllib2, urllib 
diff --git a/crediteditorwindow.py b/crediteditorwindow.py
index 4cb5a8b..11615ac 100644
--- a/crediteditorwindow.py
+++ b/crediteditorwindow.py
@@ -1,3 +1,23 @@
+"""
+A PyQT4 dialog to edit credits
+"""
+
+"""
+Copyright 2012  Anthony Beville
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
 
 from PyQt4 import QtCore, QtGui, uic
 
diff --git a/filenameparser.py b/filenameparser.py
index dbc684f..4ab7006 100644
--- a/filenameparser.py
+++ b/filenameparser.py
@@ -1,6 +1,26 @@
-#!/usr/bin/python
+"""
+Functions for parsing comic info from filename 
+
+This should probably be re-written, but, well, it mostly works!
+
+"""
+
+"""
+Copyright 2012  Anthony Beville
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
 
-# This should probably be re-written, but, well, it mostly works!
 
 # Some portions of this code were modified from pyComicMetaThis project
 # http://code.google.com/p/pycomicmetathis/
diff --git a/genericmetadata.py b/genericmetadata.py
index 56f81fb..38e4ba7 100644
--- a/genericmetadata.py
+++ b/genericmetadata.py
@@ -5,10 +5,23 @@
  tagging schemes and databases, such as ComicVine or GCD.  This makes conversion 
  possible, however lossy it might be
  
+"""
 
 """
-from sets import Set
+Copyright 2012  Anthony Beville
 
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
 
 # These page info classes are exactly the same as the CIX scheme, since it's unique
 class PageType:
diff --git a/issueselectionwindow.py b/issueselectionwindow.py
index 22c6e25..b2d378c 100644
--- a/issueselectionwindow.py
+++ b/issueselectionwindow.py
@@ -1,3 +1,23 @@
+"""
+A PyQT4 dialog to select specific issue from list
+"""
+
+"""
+Copyright 2012  Anthony Beville
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
 import sys
 from PyQt4 import QtCore, QtGui, uic
 
diff --git a/options.py b/options.py
index c9d1787..410a26e 100644
--- a/options.py
+++ b/options.py
@@ -1,7 +1,26 @@
+"""
+CLI options class for comictagger app
+"""
+
+"""
+Copyright 2012  Anthony Beville
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
 import sys
 import getopt
 
-
 class Enum(set):
     def __getattr__(self, name):
         if name in self:
diff --git a/tagger.py b/tagger.py
index b0eb7bf..8a371e5 100755
--- a/tagger.py
+++ b/tagger.py
@@ -1,7 +1,23 @@
 #!/usr/bin/python
 
 """
-A python script to tag CBZ files
+A python script to tag comic archives
+"""
+
+"""
+Copyright 2012  Anthony Beville
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
 """
 
 import sys
@@ -28,6 +44,8 @@ import utils
 #-----------------------------
 def cliProcedure( opts ):
 
+	pass
+	"""
 	comicVine = ComicVineTalker()
 
 	cv_search_results = comicVine.searchForSeries( opts.series_name )
@@ -51,7 +69,7 @@ def cliProcedure( opts ):
 	#debugging
 	ComicBookInfo().writeToExternalFile( "test.json" )
 	ComicBookInfo().writeToExternalFile( "test.xml" )
-
+	"""
 #-----------------------------
 
 def main():
diff --git a/taggerwindow.py b/taggerwindow.py
index 21f2178..f5c76fa 100644
--- a/taggerwindow.py
+++ b/taggerwindow.py
@@ -1,3 +1,22 @@
+"""
+The main window of the comictagger app
+"""
+
+"""
+Copyright 2012  Anthony Beville
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
 
 from PyQt4 import QtCore, QtGui, uic
 import locale
@@ -30,7 +49,7 @@ class TaggerWindow( QtGui.QMainWindow):
 		self.center()
 		self.raise_()
 		
-		print platform.system(), platform.release()
+		#print platform.system(), platform.release()
 		self.dirtyFlag = False
 		self.opts = opts
 		self.settings = settings
diff --git a/utils.py b/utils.py
index ac23ce4..360cb6f 100644
--- a/utils.py
+++ b/utils.py
@@ -1,5 +1,25 @@
 # coding=utf-8
 
+"""
+Some generic utilities
+"""
+
+"""
+Copyright 2012  Anthony Beville
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
 import os
 
 def listToString( l ):
diff --git a/volumeselectionwindow.py b/volumeselectionwindow.py
index ca258e0..2f03312 100644
--- a/volumeselectionwindow.py
+++ b/volumeselectionwindow.py
@@ -1,3 +1,23 @@
+"""
+A PyQT4 dialog to select specific series/volume from list
+"""
+
+"""
+Copyright 2012  Anthony Beville
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
 import sys
 from PyQt4 import QtCore, QtGui, uic