Edited file list and fixed a few minor bugs