comments and improved permissions