Add Zoe's fixes for output format. Edit formatting errors. Add/Delete header comments.