Fixed stuff and broken demo