fixed generators and logger