Fixed output messages, and typescripts