revised popups, fixed subs