By the way, on the clicking noise: If it doesn't turn out to be the rear hub, check the bottom bracket. I had a bad click/clacking noise under pedaling loads with a factory-fresh Swift and had assumed there was something wrong with the two stretches of seatpost not lining up, or something of that nature-- clicking was a fact of life with my old Dahon and I always thought it was just part of having a folding bike.
When it got bad enough I ended up calling Xootr for a replacement, who recommended that I check the BB just in case. I did, it was loose (seemingly loose from the factory), I tightened it, and everything got better.