last to-dos, pop-up fix