Better demo + fixed bug
Cleaned up