final fixes for Demo