testing and bugfixes
generators refactored