Hotfixes for client example. Draft 1, functional, before testing.