Final Updates, lots of comments