Index: /AE/installer2/src/net/oni2/aeinstaller/backend/Settings.java
===================================================================
--- /AE/installer2/src/net/oni2/aeinstaller/backend/Settings.java	(revision 618)
+++ /AE/installer2/src/net/oni2/aeinstaller/backend/Settings.java	(revision 619)
@@ -80,5 +80,4 @@
 			res = QuickAppExecution.execute(cmd);
 		} catch (IOException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
Index: /AE/installer2/src/net/oni2/aeinstaller/backend/network/FileDownloader.java
===================================================================
--- /AE/installer2/src/net/oni2/aeinstaller/backend/network/FileDownloader.java	(revision 618)
+++ /AE/installer2/src/net/oni2/aeinstaller/backend/network/FileDownloader.java	(revision 619)
@@ -122,5 +122,4 @@
 					t.join();
 				} catch (InterruptedException e) {
-					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
@@ -150,5 +149,4 @@
 			outFile = new RandomAccessFile(target, "rw");
 		} catch (FileNotFoundException e1) {
-			// TODO Auto-generated catch block
 			e1.printStackTrace();
 			state = EState.ERROR;
Index: /AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java
===================================================================
--- /AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java	(revision 618)
+++ /AE/installer2/src/net/oni2/aeinstaller/backend/oni/Installer.java	(revision 619)
@@ -101,5 +101,4 @@
 							.copyFileToDirectory(f, Paths.getEditionBasePath());
 			} catch (IOException e) {
-				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
@@ -242,5 +241,4 @@
 						FileUtils.copyFile(fbsl, targetFile);
 					} catch (IOException e) {
-						// TODO Auto-generated catch block
 						e.printStackTrace();
 					}
@@ -302,5 +300,5 @@
 
 			Vector<String> res = OniSplit.packLevel(levels.get(l), new File(
-					Paths.getEditionGDF(), l + ".dat"));
+					Paths.getEditionGDF(), sanitizeLevelName(l) + ".dat"));
 			if (res != null && res.size() > 0) {
 				for (String s : res)
@@ -551,4 +549,12 @@
 	}
 
+	private static String sanitizeLevelName(String ln) {
+		int ind = ln.indexOf("_");
+		String res = ln.substring(0, ind + 1);
+		res += ln.substring(ind + 1, ind + 2).toUpperCase();
+		res += ln.substring(ind + 2);
+		return res;
+	}
+
 	/**
 	 * Verify that the Edition is within a subfolder to vanilla Oni
Index: /AE/installer2/src/net/oni2/aeinstaller/backend/oni/OniSplit.java
===================================================================
--- /AE/installer2/src/net/oni2/aeinstaller/backend/oni/OniSplit.java	(revision 618)
+++ /AE/installer2/src/net/oni2/aeinstaller/backend/oni/OniSplit.java	(revision 619)
@@ -37,16 +37,12 @@
 					return m != null;
 				} catch (IllegalArgumentException e) {
-					// TODO Auto-generated catch block
 					e.printStackTrace();
 				} catch (IllegalAccessException e) {
-					// TODO Auto-generated catch block
 					e.printStackTrace();
 				} catch (InvocationTargetException e) {
-					// TODO Auto-generated catch block
 					e.printStackTrace();
 				} catch (Exception e) {
 					if (!e.getMessage()
 							.equals("Registry access not supported (not a Windows OS?)."))
-						// TODO Auto-generated catch block
 						e.printStackTrace();
 				}
@@ -61,5 +57,4 @@
 					res = QuickAppExecution.execute(cmd);
 				} catch (IOException e) {
-					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
@@ -104,5 +99,4 @@
 			res = QuickAppExecution.execute(cmdLine);
 		} catch (IOException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
@@ -130,5 +124,4 @@
 			res = QuickAppExecution.execute(cmdLine);
 		} catch (IOException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
@@ -160,5 +153,4 @@
 			res = QuickAppExecution.execute(cmdLine);
 		} catch (IOException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
@@ -192,5 +184,4 @@
 			res = QuickAppExecution.execute(cmdLine);
 		} catch (IOException e) {
-			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
Index: /AE/installer2/src/net/oni2/aeinstaller/backend/unpack/Unpacker.java
===================================================================
--- /AE/installer2/src/net/oni2/aeinstaller/backend/unpack/Unpacker.java	(revision 618)
+++ /AE/installer2/src/net/oni2/aeinstaller/backend/unpack/Unpacker.java	(revision 619)
@@ -85,5 +85,4 @@
 					t.join();
 				} catch (InterruptedException e) {
-					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
@@ -96,5 +95,4 @@
 						FileUtils.deleteDirectory(target);
 					} catch (IOException e) {
-						// TODO Auto-generated catch block
 						e.printStackTrace();
 					}
@@ -172,5 +170,4 @@
 								zf.close();
 						} catch (IOException e) {
-							// TODO Auto-generated catch block
 							e.printStackTrace();
 						}
Index: /AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java
===================================================================
--- /AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java	(revision 618)
+++ /AE/installer2/src/net/oni2/aeinstaller/gui/MainWin.java	(revision 619)
@@ -378,5 +378,4 @@
 					Thread.sleep(10);
 				} catch (InterruptedException e) {
-					// TODO Auto-generated catch block
 					e.printStackTrace();
 				}
@@ -568,5 +567,4 @@
 				pb.start();
 			} catch (IOException e) {
-				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
@@ -584,5 +582,4 @@
 				pb.start();
 			} catch (IOException e) {
-				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}