More changes and added some TODO items
Merging in work which was done collaboratively today.
Fix references and labels