more and maybe final popovers and smaller fixes