Replace 99 in formats to NA.
Add new properties.

* Li requested new properties for the next round of collection
Updates to template and to output report.

* change output report to more closely resemble format of template
* update template file to add new properties