Add demo, make last minute tweaks