Fixed issues from Project one