add todo
fix formatting
adjust templates for new information and add info that had not yet been added.