[r6] Add 4 files, some small corrections