fix popover, add comment field, not yet implemented