An expensive (+/- $400 USD), yet practical fix is the Trail Tank. This tank replaces your stock tank and is 15 gallons in capacity (it removes the storage space under the rear of the seat and replaces it with fuel tank). The Trail Tank is clear so that you can see the fuel level. This tank was used by last year's Iron Dog champions so it is up to the task. Check out the Trail Tank web site. Concerning bags, look at what Polaris offers - good stuff, built for your short track. Cheers.