demo fixes
better demo
fixes
Merge pull request #8 from patriot1burke/master

stuff