diff --git a/docsource/Makefile b/docsource/Makefile
index d96253c..79c08a7 100644
--- a/docsource/Makefile
+++ b/docsource/Makefile
@@ -43,6 +43,13 @@ htmlstsci:
 	@echo "try :"
 	@echo "   open http://www.stsci.edu/~mperrin/software/webbpsf/"
 
+htmlprerelease:
+	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) ../Documentation/html
+	rsync -av ../Documentation/html/ nemesis.stsci.edu:web/software/webbpsf_prerelease/
+	@echo "Software built and copied to STScI prerelease"
+	@echo "try :"
+	@echo "   open http://www.stsci.edu/~mperrin/software/webbpsf_prerelease/"
+
 
 
 dirhtml:
diff --git a/docsource/conf.py b/docsource/conf.py
index b8c4082..870a3e4 100644
--- a/docsource/conf.py
+++ b/docsource/conf.py
@@ -16,13 +16,12 @@
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.append(os.path.abspath('../lib'))
 
 # -- General configuration -----------------------------------------------------
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.autodoc', 'numpydoc','sphinx.ext.inheritance_diagram', 'sphinx.ext.pngmath']
+extensions = ['sphinx.ext.autodoc', 'numpydoc','sphinx.ext.inheritance_diagram', 'sphinx.ext.pngmath', 'sphinx.ext.autosummary', 'sphinx.ext.graphviz']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
diff --git a/docsource/fig_webbpsf_gui_tk.png b/docsource/fig_webbpsf_gui_tk.png
new file mode 100644
index 0000000..8bb1637
Binary files /dev/null and b/docsource/fig_webbpsf_gui_tk.png differ
diff --git a/docsource/fig_webbpsf_gui_wx.png b/docsource/fig_webbpsf_gui_wx.png
new file mode 100644
index 0000000..31ba5b7
Binary files /dev/null and b/docsource/fig_webbpsf_gui_wx.png differ
diff --git a/setup.py b/setup.py
index df4a83b..58dc1e4 100644
--- a/setup.py
+++ b/setup.py
@@ -3,6 +3,7 @@
 
 setupargs = {
     'name'          :       'webbpsf',
+    'app'           :       'WebbPSF',
     'version'       :      	"0.0.0",  # will be replaced below
     'description'   :       'Create simulated point spread functions for the James Webb Space Telescope',
     'fullname'      :       'WebbPSF',
@@ -11,7 +12,7 @@
     'url'           :  		"http://www.stsci.edu/~mperrin/software/webbpsf",
     'download_url'           :  		"http://www.stsci.edu/~mperrin/software/webbpsf/webbpsf-0.0.0.tar.gz",  # will be replaced below
     'platforms'     :      	["Linux","Mac OS X", "Win"],
-    'requires'      :       ['pyfits','numpy', 'matplotlib', 'scipy', 'atpy','asciitable', 'poppy'],
+    'requires'      :       ['pyfits','numpy', 'matplotlib', 'scipy', 'asciitable', 'poppy'],
     'packages'      :       ['webbpsf'],
     'entry_points'  :       {'gui_scripts': ['webbpsfgui = webbpsf.gui',]}, # should create exe file on Windows?
     'classifiers'   :   [
@@ -60,6 +61,17 @@
 
 
 
+
+
+
+PY2APP_OPTIONS = {'argv_emulation': True, 
+                'iconfile': 'webbpsf_icon.icns'}
+
+
+
+
 # Now actually call setup
 
-setup(**setupargs)
+setup(  options={'py2app':PY2APP_OPTIONS},
+        setup_requires=['py2app'],
+        **setupargs)
diff --git a/webbpsf/convert_psfs_revV.py b/webbpsf/convert_psfs_revV.py
index 5d15552..cf51736 100644
--- a/webbpsf/convert_psfs_revV.py
+++ b/webbpsf/convert_psfs_revV.py
@@ -1,11 +1,8 @@
-#!/usr/bin/env python
+#!/usr/bin/env python
 import os, sys
 import numpy as np
 import matplotlib.pyplot as plt
 import pywcs, pyfits
-#import aplpy, atpy
-#import RO.DS9
-#from IPython.Debugger import Tracer; stop = Tracer()
 
 import poppy
 
diff --git a/webbpsf/wxgui.py b/webbpsf/wxgui.py
index fe6c101..7e4df89 100755
--- a/webbpsf/wxgui.py
+++ b/webbpsf/wxgui.py
@@ -1051,7 +1051,7 @@ def emit(self, record):
 
 class LogFrame(wx.Frame):
     def __init__(self, parent=None, id=-1, pos=None, size=(600,300)):
-        wx.Frame.__init__(self, parent, id=id, title="logging test", size=size,pos=pos)
+        wx.Frame.__init__(self, parent, id=id, title="WebbPSF tasks log", size=size,pos=pos)
         #self.level = 4
         log = wx.TextCtrl(self, style=wx.TE_MULTILINE)
         sizer = wx.BoxSizer(wx.VERTICAL)
diff --git a/webbpsf_icon.icns b/webbpsf_icon.icns
new file mode 100644
index 0000000..8e904cf
Binary files /dev/null and b/webbpsf_icon.icns differ
diff --git a/webbpsf_icon.png b/webbpsf_icon.png
new file mode 100644
index 0000000..cf4253d
Binary files /dev/null and b/webbpsf_icon.png differ