Client Fixed + Updates

Updates and Tings 5