Some updates to demos + a bit of clean-up