adding shotgun and some bug fixes