fixes for demo. good to go.