Minor changes to demo & docs