Fixed alot of bugs in the demo