Fixed all code from last commit where @elizabrock made comments.