Demo almost done

only need a few fixes