diff --git a/index.js b/index.js
index 4c2a94e..919b77d 100644
--- a/index.js
+++ b/index.js
@@ -18,70 +18,73 @@ const maxNumberOfAttempts = 5;
 // <- 32
 // > getRandomNumber(1, 50)
 // <- 11
+
+guessInput.addEventListener("input", () => {
+  if (guessInput.value > 99) guessInput.value = 99;
+  if (guessInput.value < 1) guessInput.value = 1;
+});
+
 function getRandomNumber(min, max) {
-  return Math.floor(Math.random() * (max - min)) + min;
+  return Math.floor(Math.random() * (max - min + 1)) + min;
 }
 
 function checkGuess() {
   // Get value from guess input element
   const guess = parseInt(guessInput.value, 10);
-  attempts = attempts + 1;
+  attempts++;
 
   hideAllMessages();
 
   if (guess === targetNumber) {
-    numberOfGuessesMessage.style.display = '';
+    correctMessage.style.display = 'block';
+    numberOfGuessesMessage.style.display = 'block';
     numberOfGuessesMessage.innerHTML = `You made ${attempts} guesses`;
-
-    correctMessage.style.display = '';
-
     submitButton.disabled = true;
     guessInput.disabled = true;
+    resetButton.style.display = 'block'
+    return;
+  } else if (guess < targetNumber) {
+      tooLowMessage.style.display = 'block';
+  } else {
+    tooHighMessage.style.display = 'block';
   }
+  
+  const remainingAttempts = maxNumberOfAttempts - attempts;
+  const word = remainingAttempts === 1 ? "guess" : "guesses";
 
-  if (guess !== targetNumber) {
-    if (guess < targetNumber) {
-      tooLowMessage.style.display = '';
-    } else {
-      tooLowMessage.style.display = '';
-    }
-
-    const remainingAttempts = maxNumberOfAttempts - attempts;
+  numberOfGuessesMessage.style.display = 'block';
+  numberOfGuessesMessage.innerHTML = `You guessed ${guess}. <br> ${remainingAttempts} ${word} 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;
+    guessInput.style.display = 'none';
+    resetButton.style.display = 'block';
+    return;
   }
-
-  guessInput.value = '';
-
-  resetButton.style.display = '';
 }
 
 function hideAllMessages() {
-  for (let elementIndex = 0; elementIndex <= messages.length; elementIndex++) {
+  for (let elementIndex = 0; elementIndex < messages.length; elementIndex++) {
     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;
+  attempts = 0;
 
   // Enable the input and submit button
-  submitButton.disabeld = false;
+  submitButton.disabled = false;
   guessInput.disabled = false;
 
   hideAllMessages();
   resetButton.style.display = 'none';
+  guessInput.style.display = '';
 }
 
 submitButton.addEventListener('click', checkGuess);