diff --git a/awit-ssh b/awit-ssh
index 4cd22d80a0e55f62f89e90f5a307e2b08e7cdd45..3c1bde49493b1890f7c18bd76aa0ed18e7ae7550 100755
--- a/awit-ssh
+++ b/awit-ssh
@@ -63,6 +63,7 @@ GetOptions(\%optctl,
 	"help|?",
 	"version",
 
+	# TODO: debug is not implemented, make sure displayHelp is updated
 	"debug",
 
 	"knock=s",
@@ -158,7 +159,6 @@ if (defined($pkcsProvider) && $pkcsProvider ne "") {
 }
 
 
-
 if (%iniSetup) {
 	print STDERR "LDAP server URI   : $ldapURI\n";
 	print STDERR "LDAP server base  : $ldapBase\n";
@@ -205,7 +205,6 @@ if (!defined($password) || $password eq "") {
 print STDERR "\n";
 
 
-
 my $ldap = Net::LDAP->new($ldapURI,
 #	'debug' => 15
 );
@@ -273,7 +272,7 @@ if ($ldapNumResults < 1) {
 		}
 	);
 	if ($menuSelection eq "q") {
-		print STDERR "Exiting...\n";
+		print STDERR "\nExiting...\n";
 		exit 3;
 	}
 	print STDERR "\n";
@@ -288,6 +287,8 @@ if ($ldapEntry) {
 	my $ldapEntryName = $ldapEntry->get_value('cn');
 	logger('INFO',"Found server entry '".color('green')."$ldapEntryName".color('reset')."'");
 
+	# TODO: Ability to select between mulitple awitLoginHost's separated by ,'s
+
 	# Check if we need to set the port knocking host & port
 	if (my $ldapLoginKnockHost = $ldapEntry->get_value('awitLoginKnockHost')) {
 		logger('INFO',"  - Knock host ".color('green')."%s".color('reset')." (awitLoginKnockHost)",$ldapLoginKnockHost);
@@ -458,6 +459,9 @@ if (defined($forwardHost)) {
 	# Build up our forwarding process args into this...
 	my @forwardArgs = ();
 
+	# TODO: Allow the use of multiple forwarded ports by separating them with ,'s
+	# The first port will be assumed as the SSH port, all other ports will be forwarded via TCP/IP and reported in terminal
+
 	# Add on port we're forwarding
 	push(@forwardArgs,'-L',"$forwardSocket:$forwardHost:$forwardPort");