setup fixes
merged with upstream setup.py
Much more interesting demo..