bug fixes - generator is now stable