minor fixes
added auto-restart to demo
added a quit button