popups with test, DB improvements