A few tweaks/documentation on the client