fixes for popups and variable names