Finished demo and fixed errors.