Demo
Fixed a couple things