fix popover part loading, some other fixes