improve text generation + handle command