Changes to the gun and such