Fixed PR comments and improved doc