Support for formatted and non formatted messages

Moved Fatal -> Critical
Fatal now stops the process