An improved Q-machine source with a rotating cathode system