Add save demo. Fix issues in Script