Removed TODO in comments on things that are done
Merge branch 'Emily'