`with` parser bug fixing, update demo