minor update to formats (ieNotDefined, etc.)
Merge branch 'dev' into wvf