Small changes

After the NBER meeting with Benjamin and Cesarini. The big changes still
need to be done