Shotgun
Minor updates