Finished Uri and fixed .m files.