worked on issue #6, popovers fixed