Added more files
More bug fixes