Fix all the stuffs from the demo yesterday