diff --git a/endtime.bat b/endtime.bat
index ebf9ae3..acc6f18 100644
--- a/endtime.bat
+++ b/endtime.bat
@@ -1,3 +1,4 @@
 @echo off
 title endtime
-python workers\timeout.py
\ No newline at end of file
+python workers\timeout.py
+pause
\ No newline at end of file
diff --git a/google_api_wrapper b/google_api_wrapper
index de63a38..384c027 160000
--- a/google_api_wrapper
+++ b/google_api_wrapper
@@ -1 +1 @@
-Subproject commit de63a3871564e2b3f1faaa5f9c211e388358bc1f
+Subproject commit 384c0270d4ea69f8bb8ae1e65341940a32509558
diff --git a/install.bat b/install.bat
index 089f6b6..31da64d 100644
--- a/install.bat
+++ b/install.bat
@@ -41,6 +41,7 @@ setx winpython %winpython%
 
 REM adding path_append.bat to user script dir
 copy /Y %pa% "%Directory%\ua-path\path_append.bat"
+copy /Y "%Directory%\workers\pa.ps1" "%Directory%\ua-path\ps1"
 
 REM adding user script dir to path
 
diff --git a/restore_path.bat b/restore_path.bat
index 01c5ada..43d916e 100644
--- a/restore_path.bat
+++ b/restore_path.bat
@@ -1,3 +1,4 @@
 @echo off
-set op=C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Program Files (x86)\Common Files\Intel\Shared Libraries\redist\ia32\mpirt;C:\Program Files (x86)\Common Files\Intel\Shared Libraries\redist\ia32\compiler;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files\Intel\iCLS Client\;C:\Program Files\Common Files\Microsoft Shared\Windows Live;C:\Program Files (x86)\Common Files\Microsoft Shared\Windows Live;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files (x86)\Windows Live\Shared;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files\Microsoft DNX\Dnvm\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\IBM\SPSS\Statistics\24\JRE\bin;
+set op=C:\Program Files (x86)\Common Files\Intel\Shared Libraries\redist\ia32\compiler;C:\Program Files (x86)\Common Files\Intel\Shared Libraries\redist\ia32\mpirt;C:\Program Files (x86)\Common Files\Microsoft Shared\Windows Live;C:\Program Files (x86)\Common Files\Oracle\Java\javapath;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files (x86)\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files (x86)\Intel\iCLS Client\;C:\Program Files (x86)\Windows Live\Shared;C:\Program Files\Common Files\Microsoft Shared\Windows Live;C:\Program Files\IBM\SPSS\Statistics\24\JRE\bin;C:\Program Files\Intel\Intel(R) Management Engine Components\DAL;C:\Program Files\Intel\Intel(R) Management Engine Components\IPT;C:\Program Files\Intel\iCLS Client\;C:\Program Files\Microsoft DNX\Dnvm\;C:\Program Files\Microsoft SQL Server\120\Tools\Binn\;C:\Program Files\Microsoft SQL Server\130\Tools\Binn\;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Windows\system32;
+
 powershell -Command "[Environment]::SetEnvironmentVariable('path','%op%','user')"
\ No newline at end of file
diff --git a/workers/drive_api.py b/workers/drive_api.py
deleted file mode 100644
index ff05a9b..0000000
--- a/workers/drive_api.py
+++ /dev/null
@@ -1,5 +0,0 @@
-import sys
-import os
-parent = os.dirname(__file__)
-sys.path.insert(0,os.path.join(parent,r"..\google_api_wrapper\gapi"))
-from drive_api import *
\ No newline at end of file
diff --git a/workers/gdrive_api.py b/workers/gdrive_api.py
new file mode 100644
index 0000000..bc5601e
--- /dev/null
+++ b/workers/gdrive_api.py
@@ -0,0 +1,5 @@
+import sys
+import os
+parent = os.path.dirname(__file__)
+sys.path.insert(0,os.path.join(parent,r"..\google_api_wrapper"))
+from gapi.drive_api import *
\ No newline at end of file
diff --git a/workers/path_append.bat b/workers/path_append.bat
index 5dcffb8..a2e8fea 100644
--- a/workers/path_append.bat
+++ b/workers/path_append.bat
@@ -4,5 +4,5 @@ if %1 == help (
 	echo:path	Path to be added to the user PATH variable
 ) else (
 	REM echo %~dp0pa.ps1
-	%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -ExecutionPolicy Bypass -File %~dp0_pa.ps1 \"%1\"
+	%windir%\System32\WindowsPowerShell\v1.0\powershell.exe -ExecutionPolicy Bypass -File %~dp0pa.ps1 \"%1\"
 )
\ No newline at end of file
diff --git a/workers/timeout.py b/workers/timeout.py
index e73d944..f7d754b 100644
--- a/workers/timeout.py
+++ b/workers/timeout.py
@@ -1,15 +1,20 @@
 from dateutil.parser import parse
+import sys
+import os
+PARENT = os.path.dirname(__file__)
+sys.path.insert(0,PARENT)
 from upload import upload
 import datetime
-import os
 import subprocess
 import time
 from upload import upload
 t = parse(input("Enter endtime: "))
-wait = (t-datetime.datetime.today()).seconds
-subprocess.call(['timeout.exe','/nobreak',str(wait)])
+wait = int((t-datetime.datetime.today()).total_seconds())
+if wait > 0:
+	subprocess.call(['timeout.exe','/nobreak',str(wait)])
+subprocess.call([os.path.join(PARENT,'done.bat')])
 upload()
 print("Logging off in ")
-for i in range(10,-1,-1):
+for i in range(10,0,-1):
 	print(i)
 	time.sleep(1)
\ No newline at end of file
diff --git a/workers/upload.py b/workers/upload.py
index 5bea72f..f39b4ac 100644
--- a/workers/upload.py
+++ b/workers/upload.py
@@ -1,8 +1,10 @@
-from drive_api import drive_api
+import sys
 import os
 PARENT = os.path.dirname(__file__)
+sys.path.insert(0,PARENT)
+from gdrive_api import drive_api
 def abspath(path):
     return os.path.join(PARENT,path)
 def upload():
     api = drive_api('python.7z uploader',abspath(r'..\secrets\client_secret.json'),abspath(r'..\secrets'))
-    api.upload(abspath('..\..\python.7z','/python.7z'))
\ No newline at end of file
+    api.upload(abspath('..\..\python.7z'),'/python.7z')
\ No newline at end of file