bug fixes and client understands to 'user' message