incomplete fixes

repushed the generator too