added more client stuff