popover fixes
some cleanup