Simplify demo vc
Simplify demo vc
Adjust readme
Seveal larger changes in most classes