Add more messages.
Fix bug when a client disconnects too quickly.