solved a few bugsbugs, updated popups