Massive text generation improvements

Massive text generation improvements