Resolving comments, commented on the not resolved ones.