update popup and fix issues