removed template, fixed up generator