Finished work on comments.