diff --git a/brozzler/behaviors.d/noguchi.js.template b/brozzler/behaviors.d/noguchi.js.template
index a49c427..acf5dc9 100644
--- a/brozzler/behaviors.d/noguchi.js.template
+++ b/brozzler/behaviors.d/noguchi.js.template
@@ -26,14 +26,14 @@ var umbraAboveBelowOrOnScreen = function(e) {
   } else {
     return 0;  // on screen
   }
-}
+};
 
 var UMBRA_N_USER_NAME = "${parameter_username}";
 var UMBRA_N_PASSWORD = "${parameter_password}";
 
 var umbraState = {'idleSince':null};
 var umbraAlreadyClicked = {};
-var re = /(?:Previous){0,1}   (page \d+\/\d+)   (?:Next){0,1}/;
+var re = /(?:Previous){0,1}\s+(page \d+\/\d+)\s+(?:Next){0,1}/;
 
 var umbraIntervalFunc = function() {
 	var clickedSomething = false;
@@ -46,7 +46,7 @@ var umbraIntervalFunc = function() {
 		if (navlinks.length > 1) {
 			target = navlinks[1];
 		} else {
-			if navlinks[0].textContent.startsWith("Next") {
+			if (navlinks[0].textContent.startsWith("Next")) {
 				target = navlinks[0];
 			}
 		}
@@ -61,7 +61,7 @@ var umbraIntervalFunc = function() {
 			target.click();
 			clickedSomething = true;
 			umbraState.idleSince = null;
-			target_page = re.exec(document.querySelector("div.nav").textContent)
+			var target_page = re.exec(document.querySelector("div.nav").textContent);
 			console.log('clicked ' + target_page);
 			umbraAlreadyClicked[target_page] = true;
 		} else if (where > 0) {
@@ -111,7 +111,7 @@ var umbraBehaviorFinished = function() {
 }
 
 var umbraNLogin = function() {
-	login_inputs = document.querySelectorAll("#loginForm > form > div > input");
+	var login_inputs = document.querySelectorAll("#loginForm > form > div > input");
         var emailInput = login_inputs[0];
         var passwordInput = login_inputs[1];
         var loginButton = document.querySelector("div.form-submit");