diff --git a/utils/bootstrap.pl b/utils/bootstrap.pl
index 0bb89cd..8ac13dd 100755
--- a/utils/bootstrap.pl
+++ b/utils/bootstrap.pl
@@ -8,7 +8,7 @@ my $myNode = $ARGV[0];
 sub getNodes {
 	my $nodelist = "../nodelist";
 
-	open(my $data, '<', $nodelist);
+	open(my $data, '<', $nodelist) or die ("Cannot open nodelist");
 
 	print("Generating files\n");
 	while (my $line = <$data>) {
@@ -24,15 +24,15 @@ sub getNodes {
 		print("System ".$nodeName." added successfully\n");
 	}
 
-	print("Done\n");
+	print("Done\n\n");
 }
 
 sub generatePort {
 
-	my $currentNode = shift;
+	my $nodeName = shift;
 	my $nodeAddress = shift;
 
-	$currentNode =~ s/^([a-z])/\U$1/; 
+	my $currentNode = ucfirst($nodeName);
 
 	my $template = qq{
 		port $currentNode
@@ -51,6 +51,8 @@ sub generatePort {
 sub generateSys {
 	my $nodeName = shift;
 
+	my $currentNode = ucfirst($nodeName);
+
 	my $template = qq{
 		system $nodeName
 		call-login *
@@ -64,7 +66,7 @@ sub generateSys {
 		chat \"\" \\d\\d\\r\\c login: \\d\\L word: \\P
 		chat-timeout 60
 		protocol t
-		port Center
+		port $currentNode
 	};
 
 	my $sysFile = "sys";
@@ -102,8 +104,11 @@ sub preCheck()
 	system("git pull");
 	print("Installing authorized_keys\n");
 	rename("authorized_keys",".ssh/authorized_keys");
+	chdir("./utils");
 	print("Pre-flight checks done\n");
 	getNodes();
 }
 
 preCheck();
+print("\n\n");
+print("This setup script has finished. Please move the generated configuration files as ROOT to /etc/uucp\n");