More and better demos + a few fixes.