Client fixes to get everything working again and new functions