diff --git a/index.html b/index.html
index af638da..2b7269e 100644
--- a/index.html
+++ b/index.html
@@ -27,7 +27,7 @@ <h1>Guessing Game</h1>
         </p>
         <p class="message" id="correct">
           Congratulations, You guessed correctly! <br />
-          Would you like to play again?
+          <!--Would you like to play again?-->
         </p>
       </div>
       <button id="reset">Reset</button>
diff --git a/index.js b/index.js
index 4c2a94e..84371e3 100644
--- a/index.js
+++ b/index.js
@@ -9,8 +9,8 @@ const numberOfGuessesMessage = document.getElementById('number-of-guesses');
 const correctMessage = document.getElementById('correct');
 
 let targetNumber;
-let attempts = 0;
-const maxNumberOfAttempts = 5;
+let attempts;
+const maxNumberOfAttempts = 5;  
 
 // Returns a random number from min (inclusive) to max (exclusive)
 // Usage:
@@ -18,20 +18,30 @@ const maxNumberOfAttempts = 5;
 // <- 32
 // > getRandomNumber(1, 50)
 // <- 11
+hideAllMessages();
 function getRandomNumber(min, max) {
   return Math.floor(Math.random() * (max - min)) + min;
 }
 
+//MAIN LOGIC IS HERE
 function checkGuess() {
+   hideAllMessages();//cleans all previous messages.
   // Get value from guess input element
   const guess = parseInt(guessInput.value, 10);
   attempts = attempts + 1;
 
-  hideAllMessages();
-
+//Stretch goal added 
+  if(guess<1 || guess>99){
+    submitButton.disabled = true;
+    alert("Your number is out of range! Please reset and start the game again.");
+  } 
   if (guess === targetNumber) {
     numberOfGuessesMessage.style.display = '';
-    numberOfGuessesMessage.innerHTML = `You made ${attempts} guesses`;
+
+    if(attempts===1){
+      numberOfGuessesMessage.innerHTML = `You made ${attempts} guess`;//Stretch goal added 
+    } else{
+    numberOfGuessesMessage.innerHTML = `You made ${attempts} guesses`;}
 
     correctMessage.style.display = '';
 
@@ -43,48 +53,62 @@ function checkGuess() {
     if (guess < targetNumber) {
       tooLowMessage.style.display = '';
     } else {
-      tooLowMessage.style.display = '';
+      tooHighMessage.style.display = '';
+
     }
 
     const remainingAttempts = maxNumberOfAttempts - attempts;
+    if(remainingAttempts===1){
+      numberOfGuessesMessage.innerHTML = `You guessed ${guess}. <br> ${remainingAttempts} guess remaining`;
+    } else{
+      numberOfGuessesMessage.innerHTML = `You guessed ${guess}. <br> ${remainingAttempts} guesses remaining`;
+    }
 
     numberOfGuessesMessage.style.display = '';
-    numberOfGuessesMessage.innerHTML = `You guessed ${guess}. <br> ${remainingAttempts} guesses remaining`;
+    
   }
 
-  if (attempts ==== maxNumberOfAttempts) {
+  if (attempts === maxNumberOfAttempts) {
     submitButton.disabled = true;
     guessInput.disabled = true;
+    tooHighMessage.style.display = 'none'; //Added - clean final form
+    tooLowMessage.style.display = 'none'; //Added - clean final form
+    //submitButton.addEventListener('click', checkGuess);
+    
   }
 
   guessInput.value = '';
 
   resetButton.style.display = '';
+
 }
 
+
 function hideAllMessages() {
-  for (let elementIndex = 0; elementIndex <= messages.length; elementIndex++) {
+  for (let elementIndex = 0; elementIndex < messages.length; elementIndex++) {
+    console.log(`Messages list: ${messages}`);
     messages[elementIndex].style.display = 'none';
   }
 }
 
-funtion setup() {
+function setup() {
   // Get random number
   targetNumber = getRandomNumber(1, 100);
   console.log(`target number: ${targetNumber}`);
 
-  // Reset number of attempts
-  maxNumberOfAttempts = 0;
+  // Reset number of attempts 
+  attempts=0; 
 
   // Enable the input and submit button
-  submitButton.disabeld = false;
+  submitButton.disabled = false;
   guessInput.disabled = false;
-
-  hideAllMessages();
   resetButton.style.display = 'none';
+  hideAllMessages(); 
+  //resetButton.style.display = 'none';
 }
 
 submitButton.addEventListener('click', checkGuess);
 resetButton.addEventListener('click', setup);
+resetButton.style.display = 'none';
 
 setup();