Added escape commit message and auto-selection of generated comfort input