rolled back some bad changes to sentence generation