Fixed some errors

Still not running Demo though