fixed popup, hacked up count