popover fix and other fixes