Tons of comments updated