Made Mine a generator, other small fixes.