diff --git a/scripts/windows/coco-dev-setup/batch/get_language.bat b/scripts/windows/coco-dev-setup/batch/get_language.bat
index 6da02b40f..224b53657 100755
--- a/scripts/windows/coco-dev-setup/batch/get_language.bat
+++ b/scripts/windows/coco-dev-setup/batch/get_language.bat
@@ -21,17 +21,16 @@ goto:get_localisation_id
 	set /a local_id = %localisation_id%
 	if !local_id! EQU 0 set localisation_is_false=1
 	if !local_id! LSS 1 set localisation_is_false=1
-	if !local_id! GTR language_count set localisation_is_false=1
+	if !local_id! GTR !language_count! set localisation_is_false=1
 	if defined localisation_is_false (
 		echo The id you entered is invalid, please try again...
 		goto:get_localisation_id
 	) else (
 		set language_id=!languages[%local_id%]!
-		call get_text %language_id% "global-native"
-
+		call get_text !language_id! "global-native"
 		call print_dashed_seperator
-		echo You have choosen '%native%' as your language.
-		call get_text %language_id% "global-intro"
+		echo You have choosen !native! as your language.
+		call get_text !language_id! "global-intro"
 		echo !intro!
 		call print_seperator
 	)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/en.coco b/scripts/windows/coco-dev-setup/batch/localisation/en.coco
index e00b71f66..2f58c55fc 100755
--- a/scripts/windows/coco-dev-setup/batch/localisation/en.coco
+++ b/scripts/windows/coco-dev-setup/batch/localisation/en.coco
@@ -1,6 +1,6 @@
 [global]
 	native=English
-	intro=From now on we'll send you feedback in English!
+	intro=From now on we'll send our feedback in English!
 	bye=Bye Bye!
 [install]
 	begin=Installation has begun, this can take a while... Please stay tuned...
diff --git a/scripts/windows/coco-dev-setup/batch/localisation/nl.coco b/scripts/windows/coco-dev-setup/batch/localisation/nl.coco
index 6cc45f329..0de8aeb4a 100755
--- a/scripts/windows/coco-dev-setup/batch/localisation/nl.coco
+++ b/scripts/windows/coco-dev-setup/batch/localisation/nl.coco
@@ -1,5 +1,6 @@
 [global]
 	native=Nederlands
+	intro=Vanaf nu geven we onze feedback in het Nederlands!
 	bye=Bye Bye!
 [install]
 	begin=De installatie is begonnen, dit kan een tijdje duren. Geduld alsjeblieft...
diff --git a/scripts/windows/coco-dev-setup/batch/setup.bat b/scripts/windows/coco-dev-setup/batch/setup.bat
index 2a7f5f0b8..c1f8edb40 100755
--- a/scripts/windows/coco-dev-setup/batch/setup.bat
+++ b/scripts/windows/coco-dev-setup/batch/setup.bat
@@ -14,6 +14,10 @@ echo Welcome to the automated Installation of the CodeCombat Dev. Environment!
 echo v%version% authored by %author% and published by %copyright%.
 call print_seperator
 
+echo Before we start the installation, here are some tips:
+call print_tips
+call print_seperator
+
 call sign_license
 
 call get_language