Rebuild and corrections of the demo