new info and comments, still fixing issues in demo