Enhancements to include client, fixes to security.