diff --git a/Makefile.mak b/Makefile.mak
index c74b5b7..b29ac9e 100644
--- a/Makefile.mak
+++ b/Makefile.mak
@@ -6,7 +6,7 @@ CL65=$(CC65_HOME)\\cl65.exe
 PRODUCT=YAIL
 TARGET=atari
 SRC_DIR=src
-CFLAGS=-Or
+CFLAGS=-Osri
 LINKFLAGS=
 #LINKFLAGS=--debug-info -Wl --dbgfile,"myapp.dbg"
 # -D__SYSTEM_CHECK__=1
@@ -48,6 +48,12 @@ s_products: $(SRC_DIR)\*.s
     del $(**:.s=.o)
 
 atr: $(PRODUCT).XEX
-    copy $(PRODUCT).XEX atr
-    dir2atr -D $(PRODUCT).ATR atr
+    copy DOS.SYS atr\\
+    copy $(PRODUCT).XEX atr\AUTORUN.SYS
 
+disk: atr
+    @echo Building bootable disk
+    dir2atr -E -b Dos25 -P $(PRODUCT).ATR atr
+
+debug: disk
+  Altirra64 /defprofile:xl /ntsc /burstio /fastboot /debug /debugbrkrun /debugcmd: ".loadsym $(PRODUCT).lbl" /disk $(PRODUCT).ATR
diff --git a/YAIL.XEX b/YAIL.XEX
index 0e2cd32..3ad8f51 100644
Binary files a/YAIL.XEX and b/YAIL.XEX differ
diff --git a/atr/DOS.SYS b/atr/DOS.SYS
index e02bcf6..4ed443f 100644
Binary files a/atr/DOS.SYS and b/atr/DOS.SYS differ
diff --git a/server/yailsrv.py b/server/yailsrv.py
index 7509149..dc9ace3 100644
--- a/server/yailsrv.py
+++ b/server/yailsrv.py
@@ -242,6 +242,7 @@ def stream_YAI(url, client, gfx_mode):
     # download the body of response by chunk, not immediately
     try:
         print('Loading', url, url.encode())
+        file_size = 0
 
         response = requests.get(url, stream=True)
         
@@ -358,6 +359,7 @@ def handle_client_connection(client_socket):
         #loop.close()  # Close the loop when done
 
 def main():
+    connections = 0
     while True:
         client_sock, address = server.accept()
         print('Accepted connection from {}:{}'.format(address[0], address[1]))
@@ -365,7 +367,9 @@ def main():
             target=handle_client_connection,
             args=(client_sock,)  # without comma you'd get a... TypeError: handle_client_connection() argument after * must be a sequence, not _socketobject
         )
+        connections += 1
         client_handler.start()
+        print('Connections:', connections)
 
 if __name__ == "__main__":
     main()
diff --git a/src/version.h b/src/version.h
index 751d692..eb1aed0 100644
--- a/src/version.h
+++ b/src/version.h
@@ -5,6 +5,6 @@
 
 #define MAJOR_VERSION 1
 #define MINOR_VERSION 2
-#define BUILD_VERSION 14
+#define BUILD_VERSION 15
 
 #endif // YAIL_VERSION_H