Added full range of comments, this should be the final commit/push