Updating SSW-Popout: code improvements, minor changes