updated apis, fixed popover