Finished comments.
Fixed bug