Solved comment problems