added some stuff for the popover
more stuff for guardian
fixed merge conflicts