<headertabs /> removed; generation command improved