Added client save
Fix message parser