demo client enhancements
v0.01-rc2