Added more files and cleaned some stuff up