Feature/demo simple

Additional refinements for demo