Fixed upload to tmp and added few things for the demo