Many updates to handle non public comments properly