GunBit changes and adds