todo comments and more view updating