Level fix + message formatting