fixing bugs, extra popup