wip
improving the demo, lot of tweaks