Changed popover behavior
major cleanup
updates
updates
updates
updates
updates