Correcting some issues - Demo almost done :)