demo and documentation tweaks