fixes whatever was wrong with original demo, adds some new view functionality (maybe)