Added more files and fixes. YAY