Lots of comments added