Updated bunch of comments