Index: AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties	(revision 637)
+++ AE/installer2/src/net/oni2/aeinstaller/AEInstaller.properties	(revision 638)
@@ -1,2 +1,2 @@
 appname=AE Installer 2
-appversion=0.94
+appversion=0.95
Index: AE/installer2/src/net/oni2/aeinstaller/backend/mods/download/ModDownloader.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/backend/mods/download/ModDownloader.java	(revision 637)
+++ AE/installer2/src/net/oni2/aeinstaller/backend/mods/download/ModDownloader.java	(revision 638)
@@ -28,4 +28,8 @@
 		 */
 		INTERRUPTED,
+		/**
+		 * When the last file was downloaded and only unpacking is left
+		 */
+		LAST_FILE_DOWNLOADED,
 		/**
 		 * Everything completed
@@ -69,4 +73,7 @@
 		if ((state == State.RUNNING) && (currentDownload < downloads.size())) {
 			downloads.get(currentDownload).start();
+		}else if (state == State.RUNNING) {
+			state = State.LAST_FILE_DOWNLOADED;
+			notifyListener();
 		} else {
 			notifyListener();
@@ -75,6 +82,5 @@
 
 	private int getTimeElapsed() {
-		int total = (int) (new Date().getTime() - startMS)
-				/ 1000;
+		int total = (int) (new Date().getTime() - startMS) / 1000;
 		return total;
 	}
Index: AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java	(revision 637)
+++ AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java	(revision 638)
@@ -99,4 +99,5 @@
 	private JLabel lblPlatformVal;
 	private JLabel lblPackageNumberVal;
+	private JLabel lblVersionNumberVal;
 	private HTMLLinkLabel lblDescriptionVal;
 
@@ -565,4 +566,5 @@
 		lblPlatformVal.setText("");
 		lblPackageNumberVal.setText("");
+		lblVersionNumberVal.setText("");
 		if (m != null) {
 			lblSubmitterVal.setText(m.getName());
@@ -579,4 +581,5 @@
 			lblPlatformVal.setText(m.getPlatform().toString());
 			lblPackageNumberVal.setText(m.getPackageNumberString());
+			lblVersionNumberVal.setText(m.getVersion());
 		}
 	}
Index: AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.yml
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.yml	(revision 637)
+++ AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.yml	(revision 638)
@@ -79,4 +79,6 @@
             - JLabel(name=lblPackageNumber, text=lblPackageNumber.text)
             - JLabel(name=lblPackageNumberVal)
+            - JLabel(name=lblVersionNumber, text=lblVersionNumber.text)
+            - JLabel(name=lblVersionNumberVal)
             - JLabel(name=lblDescription, text=lblDescription.text)
             - JScrollPane(name=scrollDescription, vScrollBar=always, hScrollBar=asNeeded):
@@ -89,4 +91,5 @@
                  >lblPlatform      lblPlatformVal      [min]
                  >lblPackageNumber lblPackageNumberVal [min]
+                 >lblVersionNumber lblVersionNumberVal [min]
                  >^lblDescription  scrollDescription   [grow]
     - MigLayout:
Index: AE/installer2/src/net/oni2/aeinstaller/gui/downloadwindow/Downloader.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/gui/downloadwindow/Downloader.java	(revision 637)
+++ AE/installer2/src/net/oni2/aeinstaller/gui/downloadwindow/Downloader.java	(revision 638)
@@ -4,4 +4,5 @@
 import java.util.TreeSet;
 
+import javax.swing.JButton;
 import javax.swing.JDialog;
 import javax.swing.JLabel;
@@ -36,4 +37,6 @@
 	private JLabel lblRateVal;
 	private JProgressBar progress;
+	
+	private JButton btnAbort;
 
 	private ModDownloader downloader;
@@ -87,4 +90,7 @@
 			close();
 		} else {
+			if (state == State.LAST_FILE_DOWNLOADED)
+				btnAbort.setEnabled(false);
+			
 			progress.setValue(bytesDown);
 			progress.setToolTipText(String.format("%d / %d files downloaded",
Index: AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTableModel.java
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTableModel.java	(revision 637)
+++ AE/installer2/src/net/oni2/aeinstaller/gui/modtable/ModTableModel.java	(revision 638)
@@ -59,6 +59,9 @@
 			case 5:
 				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-				return sdf
-						.format(new Date(mod.getFile().getTimestamp() * 1000));
+				if (mod.getFile() != null)
+					return sdf.format(new Date(
+							mod.getFile().getTimestamp() * 1000));
+				else
+					return null;
 		}
 		return null;
Index: AE/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties
===================================================================
--- AE/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties	(revision 637)
+++ AE/installer2/src/net/oni2/aeinstaller/localization/MainWin.properties	(revision 638)
@@ -47,4 +47,5 @@
 lblPlatform.text=Platform:
 lblPackageNumber.text=Package number:
+lblVersionNumber.text=Version number:
 lblFiles.text=Number of files:
 lblDescription.text=Description: