Changed entry point
Updated demos
Message tweaks
Updated demos