shotgun improvements, not complete