added client check
removed some spam messages