clean up variable naming
update demo to go to gh-pages
rename some vars and classes