Adding some demos and tweaks