Added in some more client changes.