structure update, new comments and small view updates