diff --git a/src/main/java/eu/simstadt/regionchooser/RegionChooserBrowser.java b/src/main/java/eu/simstadt/regionchooser/RegionChooserBrowser.java
index 2df3e299275c51a609ac9f094e797b417d3784dd..81641419110493c67ca36b780471e3cf22d9b4a3 100644
--- a/src/main/java/eu/simstadt/regionchooser/RegionChooserBrowser.java
+++ b/src/main/java/eu/simstadt/regionchooser/RegionChooserBrowser.java
@@ -72,14 +72,12 @@ public Void call() throws IOException {
 
 		public void downloadRegionFromCityGML(String wktPolygon, String project, String csvCitygmls, String srsName)
 				throws IOException, ParseException, XPathParseException, NavException {
-
-			System.out.println("BEEN HERE?");
-
 			Path[] paths = Stream.of(csvCitygmls.split(";")).map(s -> citygmlPath(project, s)).toArray(Path[]::new);
 
 			StringBuilder sb = RegionExtractor.selectRegionDirectlyFromCityGML(wktPolygon, srsName, paths);
 
-			File buildingIdsFile = selectSaveFileWithDialog(project, csvCitygmls.replace(";", "_"), "selected_region");
+			File buildingIdsFile = selectSaveFileWithDialog(project,
+					csvCitygmls.replace(";", "_").replace(".gml", ""), "selected_region");
 			if (buildingIdsFile != null) {
 				try (BufferedWriter writer = Files.newBufferedWriter(buildingIdsFile.toPath())) {
 					char[] chars = new char[BUFFER];
diff --git a/src/main/resources/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js b/src/main/resources/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js
index e269c4d2dcacaeab7702e22f0184b14254f964d2..671376b6112f84509e3f5fe615c3bcacde68c0ba 100644
--- a/src/main/resources/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js
+++ b/src/main/resources/eu/simstadt/regionchooser/website/script/simstadt_openlayers.js
@@ -174,8 +174,6 @@ var regionChooser = (function(){
 		// TODO: Add checkbox + label + 
 		// TODO: Add submit.
         // TODO: If possible, highlight the corresponding polygon when hovering above a name.
-        console.log("Feature name : "+ feature["name"]);
-        console.log("Feature ID : "+ feature.getId());
 		if (fromJavaFX) {
 			link += '<input type="checkbox" id="citygml_' + feature.getId() + '" class="select_citygml"><label for="citygml_' + feature.getId() + '">' +  feature['name'] + '</label>';
 		} else {
@@ -247,12 +245,10 @@ var regionChooser = (function(){
 				$("html").addClass("wait");
 				console.log("Selected region is written in " + srsName + " coordinate system.");
 				try {
-					console.log("Before JAVA");
 					fxapp.downloadRegionFromCityGML(sketchAsWKT(srsName), project, citygmlNames.join(";"), srsName);
-					console.log("After JAVA");
 					dataPanel.append("<h2 class='ok'>Done!</h2><br/>\n");
 				} catch (e) {
-					console.log("ERROR " + e);
+					console.log("ERROR : " + e);
 					dataPanel.append("<h2 class='error'>Some problem occured!</h2><br/>\n");
 				}
 				var end = new Date().getTime();
@@ -288,6 +284,9 @@ var regionChooser = (function(){
 			dataPanel.append(wgs84_coords + "<br/>\n");
 		}
 		dataPanel.append("<h3 class='clean'>Area : " + (area / 10000).toFixed(1) + " ha\n");
+		//TODO: Add selectAll
+		//TODO: Add selectNone
+		//TODO: Hide button if empty
 		dataPanel.append('<button type="button" onclick="regionChooser.clickety_click()" id="download" style="visibility:hidden">Download Region</button>');
 		dataPanel.append('<br/>\n');
 		findIntersections();
@@ -372,15 +371,11 @@ var regionChooser = (function(){
 	}
 	
 	publicScope.clickety_click = function() {
-		console.log("You clicked pretty well");
 		var checkedBoxes = Array.from(document.querySelectorAll("input.select_citygml")).filter(c => c.checked);
 		if (checkedBoxes.length === 0){
 			console.log("You should select at least one citygml, though.");
 		} else{
-			checkedBoxes.forEach(c => {
-				console.log("Nice! You checked Citygml " + c.id)
-			});
-				publicScope.downloadRegionFromCityGML(checkedBoxes.map(c => c.id));
+			publicScope.downloadRegionFromCityGML(checkedBoxes.map(c => c.id));
 		}
 	}