minor fixes

fixed bugs
added popover