Fixed issues, need to work on extra credit