Added shotbot improvements