fixed various generator issues