Fixed small issues in messages and orders