Updated build and demos