touchups fixed buggy popup and missing source