diff --git a/osx_installer.py b/osx_installer.py
index ea4e59e081..18e5ab2bf2 100644
--- a/osx_installer.py
+++ b/osx_installer.py
@@ -174,6 +174,7 @@ _check_symlinks_prescript()
         self.add_qt_plugins()
         resource_dir = os.path.join(self.dist_dir, 
                                     APPNAME + '.app', 'Contents', 'Resources')
+        frameworks_dir = os.path.join(os.path.dirname(resource_dir), 'Frameworks')
         all_scripts = scripts['console'] + scripts['gui']
         all_names   = basenames['console'] + basenames['gui']
         all_modules   = main_modules['console'] + main_modules['gui']
@@ -189,6 +190,9 @@ _check_symlinks_prescript()
             os.chmod(path, stat.S_IXUSR|stat.S_IXGRP|stat.S_IXOTH|stat.S_IREAD\
                      |stat.S_IWUSR|stat.S_IROTH|stat.S_IRGRP)
             
+        print
+        print 'Adding clit'
+        os.link(os.path.expanduser('~/clit'), os.path.join(frameworks_dir, 'clit'))
         print
         print 'Installing prescipt'
         sf = [os.path.basename(s) for s in all_names]
diff --git a/setup.py b/setup.py
index 1c7a6eff31..480ee982d8 100644
--- a/setup.py
+++ b/setup.py
@@ -21,12 +21,13 @@ from libprs500 import __appname__ as APPNAME
 
 entry_points = {
         'console_scripts': [ \
-                             'prs500 = libprs500.devices.prs500.cli.main:main', \
+                             'prs500   = libprs500.devices.prs500.cli.main:main', \
                              'lrf-meta = libprs500.ebooks.lrf.meta:main', \
                              'rtf-meta = libprs500.ebooks.metadata.rtf:main', \
-                             'txt2lrf = libprs500.ebooks.lrf.txt.convert_from:main', \
+                             'txt2lrf  = libprs500.ebooks.lrf.txt.convert_from:main', \
                              'html2lrf = libprs500.ebooks.lrf.html.convert_from:main',\
                              'markdown = libprs500.ebooks.markdown.markdown:main',\
+                             'lit2lrf  = libprs500.ebooks.lrf.lit.convert_from:main',\
                            ], 
         'gui_scripts'    : [ APPNAME+' = libprs500.gui.main:main']
       }
diff --git a/upload.py b/upload.py
index e82bc2c534..cf20d3126a 100644
--- a/upload.py
+++ b/upload.py
@@ -20,7 +20,7 @@ def build_windows():
     
     
     
-    vm = h.openVM('/mnt/backup/vmware/Windows Vista/Windows Vista.vmx')
+    vm = h.openVM('/mnt/vista/vmware/Windows Vista/Windows Vista.vmx')
     vm.powerOn() 
     if not vm.waitForToolsInGuest():
         print >>sys.stderr, 'Windows is not booting up'
@@ -44,7 +44,7 @@ def build_osx():
     if os.path.exists('dist/dmgdone'):
         os.unlink('dist/dmgdone')
     
-    vm = h.openVM('/mnt/backup/vmware/Mac OSX/Mac OSX.vmx')
+    vm = h.openVM('/mnt/osx/Mac OSX/Mac OSX.vmx')
     vm.powerOn()
     c = 25 * 60
     print 'Waiting (minutes):',
diff --git a/windows_installer.py b/windows_installer.py
index 1de133dc53..3e984b36b3 100644
--- a/windows_installer.py
+++ b/windows_installer.py
@@ -50,6 +50,7 @@ Var MUI_TEMP
 !define PY2EXE_DIR "%(py2exe_dir)s"
 !define LIBUSB_DIR "C:\libusb-prs500"
 !define LIBUNRAR_DIR "C:\Program Files\UnrarDLL"
+!define CLIT         "C:\clit\clit.exe"
 
 ;------------------------------------------------------------------------------------------------------
 ;General
@@ -117,6 +118,7 @@ Section "libprs500" Seclibprs500
   
   ;ADD YOUR OWN FILES HERE...
   File /r "${PY2EXE_DIR}\*"
+  File "${CLIT}"
     
   SetOutPath "$INSTDIR\driver"
   File "${LIBUSB_DIR}\*.dll"
@@ -278,6 +280,9 @@ class BuildEXE(build_exe):
 console = [dict(dest_base=basenames['console'][i], script=scripts['console'][i]) 
            for i in range(len(scripts['console']))]
 
+PY2EXE_DIR = os.path.join('build','py2exe')
+if os.path.exists(PY2EXE_DIR):
+    shutil.rmtree(PY2EXE_DIR)
 setup(
       cmdclass = {'py2exe': BuildEXE},
       windows = [{'script'          : scripts['gui'][0], 
@@ -288,7 +293,7 @@ setup(
       console = console,
       options = { 'py2exe' : {'compressed': 1,
                               'optimize'  : 2,
-                              'dist_dir'  : r'build\py2exe',
+                              'dist_dir'  : PY2EXE_DIR,
                               'includes'  : ['sip', 'pkg_resources', 'PyQt4.QtSvg'],                                
                               'packages'  : ['PIL'],
                               'excludes'  : ["Tkconstants", "Tkinter", "tcl",