More generator enhancements

probably want to remove this - maybe in next patch