Fixing broken live demo. More cleanup to getting-code along with inline demo