Fixed issues that were pointed out by instrucotr durring a review of my initial code.