Renamign to ifield and more proofreading