security fixes and allow feedback comments to be optional