Changed the while loop + conditions

2 errors still