fixes and popup