fix popup crash & minor bug gun