Fixed the bug causing the files not to load after a demo was used. Also cleaned up the code so that the demo loading code was not repeated.