fixed issues in demo