fixed demo issues